Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Removes old PDAs #22671

Merged
ToasterBiome merged 10 commits into from
Oct 13, 2024
Merged

Removes old PDAs #22671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9d9075b
Removes old PDAs
JohnFulpWillard Oct 3, 2024
267923c
Removes ntnet store
JohnFulpWillard Oct 3, 2024
ffe40ab
limits ntnet removal to pai
JohnFulpWillard Oct 3, 2024
fb71b4f
Update message.dm
JohnFulpWillard Oct 3, 2024
5860c5a
Merge remote-tracking branch 'upstream/master' into removes-old-pda
JohnFulpWillard Oct 3, 2024
ed79219
re-adds pda painter
JohnFulpWillard Oct 12, 2024
46f8d51
updates pda painter to work with new pdas
ynot01 Oct 12, 2024
02fd902
Update PDApainter.dm
ynot01 Oct 12, 2024
e54470b
Update PDApainter.dm
ynot01 Oct 12, 2024
10cf7aa
Merge pull request #2 from ynot01/pda-painter-stuff
JohnFulpWillard Oct 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 8 additions & 21 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_cafe_of_broken_dreams.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,6 @@
/obj/machinery/light/small,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/powered)
"aT" = (
/obj/structure/table/wood/bar,
/obj/item/pda/chameleon,
/turf/open/floor/wood,
/area/ruin/powered)
"aU" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile,
Expand All @@ -121,7 +116,6 @@
/obj/structure/sink{
desc = "Clean off your radiation.";
dir = 8;
icon_state = "sink";
pixel_x = -12;
pixel_y = 2
},
Expand Down Expand Up @@ -187,8 +181,7 @@
/area/ruin/powered)
"bi" = (
/obj/machinery/light{
dir = 8;
icon_state = "tube"
dir = 8
},
/turf/open/floor/wood,
/area/ruin/powered)
Expand Down Expand Up @@ -243,8 +236,7 @@
/area/ruin/powered)
"bv" = (
/obj/structure/chair/comfy/beige{
dir = 4;
icon_state = "comfychair"
dir = 4
},
/turf/open/floor/wood,
/area/ruin/powered)
Expand All @@ -264,8 +256,7 @@
/area/ruin/powered)
"bz" = (
/obj/structure/chair/comfy/beige{
dir = 1;
icon_state = "comfychair"
dir = 1
},
/turf/open/floor/wood,
/area/ruin/powered)
Expand All @@ -274,8 +265,7 @@
dir = 4
},
/obj/machinery/light{
dir = 8;
icon_state = "tube"
dir = 8
},
/turf/open/floor/wood,
/area/ruin/powered)
Expand All @@ -286,8 +276,7 @@
/area/ruin/powered)
"bE" = (
/obj/machinery/light{
dir = 4;
icon_state = "tube"
dir = 4
},
/turf/open/floor/wood{
icon_state = "wood-broken4"
Expand Down Expand Up @@ -322,8 +311,7 @@
"bR" = (
/obj/structure/table/wood,
/obj/machinery/light{
dir = 8;
icon_state = "tube"
dir = 8
},
/turf/open/floor/wood,
/area/ruin/powered)
Expand Down Expand Up @@ -427,8 +415,7 @@
/area/ruin/powered)
"zW" = (
/obj/machinery/light{
dir = 1;
icon_state = "tube"
dir = 1
},
/turf/open/floor/wood,
/area/ruin/powered)
Expand Down Expand Up @@ -2681,7 +2668,7 @@ ai
bj
ai
ai
aT
aw
ai
ai
ai
Expand Down
96 changes: 31 additions & 65 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_clownfacility.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@
/area/ruin/unpowered)
"al" = (
/obj/structure/chair/bananium{
dir = 8;
icon_state = "bananium_chair"
dir = 8
},
/turf/open/floor/mineral/bananium,
/area/ruin/unpowered)
Expand All @@ -62,20 +61,16 @@
/obj/item/clothing/gloves/color/rainbow,
/obj/item/clothing/mask/gas/clown_hat,
/obj/item/clothing/shoes/clown_shoes,
/obj/item/clothing/under/rank/clown,
/obj/item/storage/backpack/clown,
/obj/item/storage/backpack/duffelbag/clown,
/obj/item/cartridge/virus/clown,
/turf/open/floor/mineral/bananium,
/area/ruin/unpowered)
"ao" = (
/obj/machinery/door/airlock/bananium,
/turf/open/floor/mineral/bananium,
/area/ruin/unpowered)
"ap" = (
/obj/structure/bed{
pixel_y = 0
},
/obj/structure/bed,
/obj/item/bedsheet/clown,
/turf/open/floor/mineral/bananium,
/area/ruin/unpowered)
Expand Down Expand Up @@ -350,16 +345,13 @@
"bl" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4;
icon_state = "tile_corner"
dir = 4
},
/obj/effect/turf_decal/tile/red{
dir = 1;
icon_state = "tile_corner"
dir = 1
},
/obj/effect/turf_decal/tile/red{
dir = 8;
icon_state = "tile_corner"
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered)
Expand Down Expand Up @@ -391,24 +383,20 @@
},
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4;
icon_state = "tile_corner"
dir = 4
},
/obj/effect/turf_decal/tile/red{
dir = 1;
icon_state = "tile_corner"
dir = 1
},
/obj/effect/turf_decal/tile/red{
dir = 8;
icon_state = "tile_corner"
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered)
"br" = (
/obj/item/grown/bananapeel,
/obj/effect/turf_decal/stripes/line{
dir = 8;
icon_state = "warningline"
dir = 8
},
/turf/open/floor/plasteel/dark{
dir = 8
Expand All @@ -418,16 +406,13 @@
/obj/effect/decal/cleanable/oil/streak,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4;
icon_state = "tile_corner"
dir = 4
},
/obj/effect/turf_decal/tile/red{
dir = 1;
icon_state = "tile_corner"
dir = 1
},
/obj/effect/turf_decal/tile/red{
dir = 8;
icon_state = "tile_corner"
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered)
Expand All @@ -448,40 +433,33 @@
/obj/item/paperplane,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4;
icon_state = "tile_corner"
dir = 4
},
/obj/effect/turf_decal/tile/red{
dir = 1;
icon_state = "tile_corner"
dir = 1
},
/obj/effect/turf_decal/tile/red{
dir = 8;
icon_state = "tile_corner"
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered)
"bw" = (
/obj/item/coin/bananium,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4;
icon_state = "tile_corner"
dir = 4
},
/obj/effect/turf_decal/tile/red{
dir = 1;
icon_state = "tile_corner"
dir = 1
},
/obj/effect/turf_decal/tile/red{
dir = 8;
icon_state = "tile_corner"
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered)
"bx" = (
/obj/effect/turf_decal/stripes/line{
dir = 8;
icon_state = "warningline"
dir = 8
},
/turf/open/floor/plasteel/dark{
dir = 8
Expand All @@ -493,16 +471,13 @@
/obj/item/pickaxe/drill,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4;
icon_state = "tile_corner"
dir = 4
},
/obj/effect/turf_decal/tile/red{
dir = 1;
icon_state = "tile_corner"
dir = 1
},
/obj/effect/turf_decal/tile/red{
dir = 8;
icon_state = "tile_corner"
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered)
Expand All @@ -523,50 +498,41 @@
/obj/structure/mecha_wreckage/honker,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4;
icon_state = "tile_corner"
dir = 4
},
/obj/effect/turf_decal/tile/red{
dir = 1;
icon_state = "tile_corner"
dir = 1
},
/obj/effect/turf_decal/tile/red{
dir = 8;
icon_state = "tile_corner"
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered)
"bD" = (
/obj/effect/decal/cleanable/robot_debris,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4;
icon_state = "tile_corner"
dir = 4
},
/obj/effect/turf_decal/tile/red{
dir = 1;
icon_state = "tile_corner"
dir = 1
},
/obj/effect/turf_decal/tile/red{
dir = 8;
icon_state = "tile_corner"
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered)
"bE" = (
/obj/effect/decal/cleanable/shreds,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4;
icon_state = "tile_corner"
dir = 4
},
/obj/effect/turf_decal/tile/red{
dir = 1;
icon_state = "tile_corner"
dir = 1
},
/obj/effect/turf_decal/tile/red{
dir = 8;
icon_state = "tile_corner"
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered)
Expand Down
13 changes: 1 addition & 12 deletions _maps/RandomRuins/SpaceRuins/bigderelict1.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,6 @@
/obj/item/ammo_casing/c45{
caliber = null;
desc = "A .45 bullet casing. This one is spent.";
icon_state = "s-casing";
name = "spent bullet casing"
},
/obj/machinery/light{
Expand Down Expand Up @@ -924,7 +923,6 @@
/area/ruin/space/has_grav/derelictoutpost)
"ck" = (
/obj/machinery/power/apc{
dir = 2;
name = "Tradepost APC";
pixel_y = -23;
start_charge = 0
Expand Down Expand Up @@ -1278,7 +1276,6 @@
/obj/item/ammo_casing/c45{
caliber = null;
desc = "A .45 bullet casing. This one is spent.";
icon_state = "s-casing";
name = "spent bullet casing"
},
/turf/open/floor/plasteel,
Expand Down Expand Up @@ -1345,7 +1342,6 @@
/obj/item/ammo_casing/c45{
caliber = null;
desc = "A .45 bullet casing. This one is spent.";
icon_state = "s-casing";
name = "spent bullet casing"
},
/obj/structure/alien/weeds{
Expand Down Expand Up @@ -1742,7 +1738,6 @@
/obj/item/ammo_casing/c45{
caliber = null;
desc = "A .45 bullet casing. This one is spent.";
icon_state = "s-casing";
name = "spent bullet casing"
},
/obj/structure/alien/weeds{
Expand Down Expand Up @@ -2124,12 +2119,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/cargostorage)
"eC" = (
/obj/structure/closet/crate,
/obj/item/pda/clear,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/cargostorage)
"eE" = (
/obj/structure/closet/crate/internals,
/obj/item/tank/internals/emergency_oxygen/engi,
Expand Down Expand Up @@ -2589,7 +2578,7 @@ dV
ej
eo
ex
eC
eF
dL
aR
aZ
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/gameroom.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@
/area/ruin/space/has_grav/powered/gaming)
"HV" = (
/obj/machinery/vending/gifts{
products = list(/obj/item/toy/heartballoon = 3, /obj/item/toy/toyballoon = 3, /obj/item/toy/gun/toyglock = 3, /obj/item/toy/gun/toyflaregun = 3, /obj/item/toy/toygrenade = 15, /obj/item/toy/plush/teddybear = 5, /obj/item/toy/plush/stuffedmonkey = 5, /obj/item/toy/plush/flowerbunch = 5, /obj/item/camera_film = 30, /obj/item/storage/photo_album = 5, /obj/item/storage/photobook = 5, /obj/item/hourglass = 2, /obj/item/toy/frisbee = 2, /obj/item/toy/boomerang = 2, /obj/item/storage/bag/photo = 5, /obj/item/toy/plush/bubbleplush = 2, /obj/item/toy/plush/plushvar = 2, /obj/item/toy/plush/narplush = 2, /obj/item/toy/plush/lizardplushie = 2, /obj/item/toy/plush/snakeplushie = 2, /obj/item/toy/plush/nukeplushie = 2, /obj/item/toy/plush/slimeplushie = 2, /obj/item/toy/plush/inorixplushie = 2, /obj/item/toy/plush/beeplushie = 2, /obj/item/instrument/accordion = 1, /obj/item/instrument/eguitar = 1, /obj/item/instrument/glockenspiel = 1, /obj/item/instrument/harmonica = 1, /obj/item/instrument/recorder = 1, /obj/item/instrument/saxophone = 1, /obj/item/instrument/trombone = 1, /obj/item/instrument/trumpet = 1, /obj/item/instrument/piano_synth = 1, /obj/item/instrument/banjo = 1, /obj/item/storage/backpack = 4, /obj/item/reagent_containers/syringe = 3, /obj/item/reagent_containers/pill/patch/styptic = 2, /obj/item/reagent_containers/pill/patch/silver_sulf = 2, /obj/item/reagent_containers/glass/bottle/charcoal = 1, /obj/item/reagent_containers/pill/epinephrine = 1, /obj/item/reagent_containers/glass/beaker/large = 2, /obj/item/flashlight = 3, /obj/item/flashlight/flare = 1, /obj/item/storage/toolbox/mechanical = 1, /obj/item/stack/cable_coil/random = 4, /obj/item/pda = 8, /obj/item/cartridge/engineering = 2, /obj/item/cartridge/atmos = 2, /obj/item/cartridge/medical = 2, /obj/item/cartridge/chemistry = 2, /obj/item/cartridge/janitor = 2, /obj/item/cartridge/lawyer = 2, /obj/item/cartridge/curator = 2, /obj/item/cartridge/roboticist = 2, /obj/item/cartridge/quartermaster = 2, /obj/item/storage/fancy/candle_box = 2, /obj/item/storage/crayons = 2)
products = list(/obj/item/toy/heartballoon = 3, /obj/item/toy/toyballoon = 3, /obj/item/toy/gun/toyglock = 3, /obj/item/toy/gun/toyflaregun = 3, /obj/item/toy/toygrenade = 15, /obj/item/toy/plush/teddybear = 5, /obj/item/toy/plush/stuffedmonkey = 5, /obj/item/toy/plush/flowerbunch = 5, /obj/item/camera_film = 30, /obj/item/storage/photo_album = 5, /obj/item/storage/photobook = 5, /obj/item/hourglass = 2, /obj/item/toy/frisbee = 2, /obj/item/toy/boomerang = 2, /obj/item/storage/bag/photo = 5, /obj/item/toy/plush/bubbleplush = 2, /obj/item/toy/plush/plushvar = 2, /obj/item/toy/plush/narplush = 2, /obj/item/toy/plush/lizardplushie = 2, /obj/item/toy/plush/snakeplushie = 2, /obj/item/toy/plush/nukeplushie = 2, /obj/item/toy/plush/slimeplushie = 2, /obj/item/toy/plush/inorixplushie = 2, /obj/item/toy/plush/beeplushie = 2, /obj/item/instrument/accordion = 1, /obj/item/instrument/eguitar = 1, /obj/item/instrument/glockenspiel = 1, /obj/item/instrument/harmonica = 1, /obj/item/instrument/recorder = 1, /obj/item/instrument/saxophone = 1, /obj/item/instrument/trombone = 1, /obj/item/instrument/trumpet = 1, /obj/item/instrument/piano_synth = 1, /obj/item/instrument/banjo = 1, /obj/item/storage/backpack = 4, /obj/item/reagent_containers/syringe = 3, /obj/item/reagent_containers/pill/patch/styptic = 2, /obj/item/reagent_containers/pill/patch/silver_sulf = 2, /obj/item/reagent_containers/glass/bottle/charcoal = 1, /obj/item/reagent_containers/pill/epinephrine = 1, /obj/item/reagent_containers/glass/beaker/large = 2, /obj/item/flashlight = 3, /obj/item/flashlight/flare = 1, /obj/item/storage/toolbox/mechanical = 1, /obj/item/stack/cable_coil/random = 4, /obj/item/storage/fancy/candle_box = 2, /obj/item/storage/crayons = 2)
},
/obj/machinery/light{
dir = 8
Expand Down
Loading