From 020c838438ec0bc8ae89fd82adc4adae57563595 Mon Sep 17 00:00:00 2001 From: Peter Date: Wed, 19 Jul 2023 16:54:38 +0300 Subject: [PATCH 1/3] Map update: Cyberiad: EFTPOS population added EFTPOS on map for new economics update --- _maps/map_files/cyberiad/cyberiad.dmm | 187 +++++++++++++++++++++++--- 1 file changed, 172 insertions(+), 15 deletions(-) diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 4958c1a19f4..d62e0009af1 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -1191,7 +1191,7 @@ "aeV" = ( /obj/machinery/computer/security{ dir = 8; - network = list("SS13","Research Outpost","Mining Outpost") + network = list("SS13","Research Outpost","Mining Outpost") }, /obj/item/radio/intercom{ name = "custom station intercom (General)"; @@ -3759,6 +3759,9 @@ pixel_x = -8; pixel_y = 12 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "escape" @@ -3861,7 +3864,7 @@ "amR" = ( /obj/machinery/computer/security{ dir = 8; - network = list("SS13","Research Outpost","Mining Outpost") + network = list("SS13","Research Outpost","Mining Outpost") }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -4910,7 +4913,7 @@ "api" = ( /obj/machinery/computer/security{ dir = 8; - network = list("SS13","Research Outpost","Mining Outpost") + network = list("SS13","Research Outpost","Mining Outpost") }, /obj/machinery/light{ dir = 4 @@ -5611,7 +5614,7 @@ "arl" = ( /obj/machinery/computer/security{ dir = 4; - network = list("SS13","Research Outpost","Mining Outpost") + network = list("SS13","Research Outpost","Mining Outpost") }, /turf/simulated/floor/plasteel{ dir = 8; @@ -6209,7 +6212,7 @@ /area/security/brig) "asw" = ( /obj/machinery/computer/security{ - network = list("SS13","Research Outpost","Mining Outpost") + network = list("SS13","Research Outpost","Mining Outpost") }, /obj/machinery/computer/security/telescreen{ desc = "Used for watching Prison Wing holding areas."; @@ -11335,6 +11338,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -12460,6 +12466,9 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = -32 }, +/obj/item/eftpos{ + pixel_y = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "barber" }, @@ -17580,7 +17589,7 @@ pixel_y = 30 }, /obj/machinery/computer/security{ - network = list("SS13","Research Outpost","Mining Outpost") + network = list("SS13","Research Outpost","Mining Outpost") }, /turf/simulated/floor/plasteel{ dir = 1; @@ -17800,6 +17809,7 @@ /area/crew_quarters/dorms) "aWD" = ( /obj/structure/table/wood, +/obj/item/eftpos, /turf/simulated/floor/carpet, /area/crew_quarters/dorms) "aWE" = ( @@ -20098,6 +20108,9 @@ pixel_x = 6; pixel_y = 12 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel, /area/storage/primary) "bdc" = ( @@ -20677,6 +20690,10 @@ pixel_x = -2; pixel_y = 5 }, +/obj/item/eftpos{ + pixel_x = 9; + pixel_y = 11 + }, /turf/simulated/floor/carpet/black, /area/chapel/office) "bet" = ( @@ -20769,6 +20786,7 @@ name = "north newscaster"; pixel_y = 34 }, +/obj/item/eftpos, /turf/simulated/floor/light{ icon_state = "light_on-p"; state = 7 @@ -22071,6 +22089,10 @@ /obj/machinery/reagentgrinder{ pixel_y = 8 }, +/obj/item/eftpos{ + pixel_x = 9 + }, +/obj/item/eftpos, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -24988,6 +25010,9 @@ /obj/structure/table/reinforced, /obj/item/flash, /obj/item/flash, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel, /area/bridge) "bps" = ( @@ -25528,7 +25553,7 @@ /area/bridge) "bqQ" = ( /obj/machinery/computer/security{ - network = list("SS13","Research Outpost","Mining Outpost","Telecomms") + network = list("SS13","Research Outpost","Mining Outpost","Telecomms") }, /obj/machinery/camera{ c_tag = "Bridge West" @@ -30085,6 +30110,9 @@ "bDy" = ( /obj/item/storage/fancy/donut_box, /obj/structure/table/wood, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bDB" = ( @@ -31569,6 +31597,7 @@ /obj/item/toy/figure/roboticist{ pixel_y = 8 }, +/obj/item/eftpos, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitepurple" @@ -32075,6 +32104,7 @@ name = "east station intercom (General)"; pixel_x = 22 }, +/obj/item/eftpos, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple"; @@ -34698,6 +34728,9 @@ pixel_y = -2 }, /obj/item/stamp/hop, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/wood, /area/crew_quarters/heads) "bTd" = ( @@ -34846,6 +34879,9 @@ amount = 50 }, /obj/item/multitool, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel, /area/quartermaster/office) "bTC" = ( @@ -35280,7 +35316,7 @@ /obj/machinery/computer/security/telescreen{ desc = "Used for watching the RD's goons from the safety of his office."; name = "Research Monitor"; - network = list("Research","Research Outpost","RD"); + network = list("Research","Research Outpost","RD"); pixel_y = 2 }, /obj/structure/table/glass, @@ -37057,6 +37093,9 @@ /obj/item/grenade/chem_grenade/cleaner, /obj/item/grenade/chem_grenade/cleaner, /obj/item/grenade/chem_grenade/cleaner, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel, /area/janitor) "ccS" = ( @@ -37249,6 +37288,9 @@ name = "Cargo Requests Console"; pixel_x = -30 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "cdz" = ( @@ -37306,6 +37348,9 @@ layer = 4; pixel_y = 32 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "cdH" = ( @@ -38367,6 +38412,10 @@ /obj/structure/table, /obj/item/coin/silver, /obj/item/toy/figure/qm, +/obj/item/eftpos{ + pixel_x = 9; + pixel_y = 11 + }, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "ciy" = ( @@ -39622,6 +39671,10 @@ name = "south bump"; pixel_y = -26 }, +/obj/item/eftpos{ + pixel_x = 9; + pixel_y = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -41140,7 +41193,7 @@ "cxg" = ( /obj/machinery/computer/general_air_control{ name = "Tank Monitor"; - sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous Oxide","waste_sensor"="Gas Mix Tank") + sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous Oxide","waste_sensor"="Gas Mix Tank") }, /turf/simulated/floor/plasteel{ dir = 4; @@ -41205,7 +41258,7 @@ frequency = 1443; level = 3; name = "Distribution and Waste Monitor"; - sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop") + sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop") }, /obj/structure/cable{ icon_state = "2-8" @@ -41558,6 +41611,9 @@ "cyG" = ( /obj/structure/table, /obj/item/t_scanner, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" @@ -41948,7 +42004,7 @@ frequency = 1443; level = 3; name = "Distribution and Waste Monitor"; - sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop") + sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop") }, /turf/simulated/floor/plasteel, /area/engine/controlroom) @@ -46276,6 +46332,7 @@ pixel_y = 9 }, /obj/machinery/light, +/obj/item/eftpos, /turf/simulated/floor/plasteel, /area/engine/break_room) "cOi" = ( @@ -47967,6 +48024,7 @@ pixel_x = 8; pixel_y = 14 }, +/obj/item/eftpos, /turf/simulated/floor/carpet/purple, /area/crew_quarters/hor) "cSi" = ( @@ -48956,6 +49014,9 @@ /obj/machinery/camera{ c_tag = "Engineering North-West" }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "cUk" = ( @@ -58478,7 +58539,7 @@ "dTM" = ( /obj/machinery/computer/general_air_control{ name = "Tank Monitor"; - sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous Oxide","waste_sensor"="Gas Mix Tank") + sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous Oxide","waste_sensor"="Gas Mix Tank") }, /obj/machinery/alarm{ pixel_y = 26 @@ -59273,6 +59334,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/carpet, /area/medical/psych) "elD" = ( @@ -59852,6 +59916,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/item/eftpos, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -59917,6 +59982,9 @@ /obj/structure/table/reinforced, /obj/item/pen, /obj/item/paper_bin/nanotrasen, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -60605,6 +60673,9 @@ name = "north station intercom (General)"; pixel_y = 22 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "arrival" @@ -64531,6 +64602,7 @@ pixel_y = 6 }, /obj/item/melee/chainofcommand, +/obj/item/eftpos, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -64743,6 +64815,9 @@ "gQY" = ( /obj/structure/table/reinforced, /obj/machinery/defibrillator_mount/loaded, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -68530,6 +68605,14 @@ icon_state = "darkpurple" }, /area/toxins/mixing) +"iMg" = ( +/obj/structure/table/wood, +/obj/item/eftpos{ + pixel_x = 9; + pixel_y = 11 + }, +/turf/simulated/floor/wood, +/area/library) "iMs" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -69410,6 +69493,9 @@ /obj/item/folder/yellow, /obj/item/eftpos, /obj/item/storage/belt/utility, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel, /area/quartermaster/office) "jiV" = ( @@ -70293,6 +70379,9 @@ name = "east light switch"; pixel_x = 24 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -72090,6 +72179,7 @@ pixel_x = -5; pixel_y = 8 }, +/obj/item/eftpos, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -73545,6 +73635,9 @@ name = "north station intercom (General)"; pixel_y = 22 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "lae" = ( @@ -75218,6 +75311,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -75693,6 +75789,9 @@ name = "east fire alarm"; pixel_x = 24 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, @@ -76156,6 +76255,10 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/item/eftpos{ + pixel_x = 9; + pixel_y = 11 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" @@ -77774,6 +77877,7 @@ pixel_x = 6; pixel_y = 10 }, +/obj/item/eftpos, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whiteblue" @@ -79324,6 +79428,10 @@ /obj/machinery/light{ dir = 1 }, +/obj/item/eftpos, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -79421,6 +79529,10 @@ pixel_x = 26 }, /obj/item/paper_bin/nanotrasen, +/obj/item/eftpos{ + pixel_x = 9; + pixel_y = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -80131,6 +80243,9 @@ name = "east fire alarm"; pixel_x = 24 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/carpet, /area/civilian/vacantoffice) "nXr" = ( @@ -80955,6 +81070,9 @@ c_tag = "Brig Briefing Room West"; dir = 4 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel, /area/security/main) "ouy" = ( @@ -82613,6 +82731,9 @@ req_access = list(2) }, /obj/effect/spawner/lootdrop/maintenance, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plating, /area/maintenance/secpost) "pkG" = ( @@ -82652,6 +82773,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/item/eftpos, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -85263,7 +85385,7 @@ dir = 1; frequency = 1222; name = "Mixing Chamber Monitor"; - sensors = list("toxins_mixing_exterior"="Mixing Chamber - Exterior","toxins_mixing_interior"="Mixing Chamber - Interior") + sensors = list("toxins_mixing_exterior"="Mixing Chamber - Exterior","toxins_mixing_interior"="Mixing Chamber - Interior") }, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" @@ -85370,6 +85492,9 @@ /obj/item/clothing/glasses/welding{ pixel_y = 16 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel, /area/atmos) "qww" = ( @@ -86017,6 +86142,9 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plating, /area/maintenance/engrooms) "qMf" = ( @@ -86519,6 +86647,7 @@ "qXZ" = ( /obj/structure/table/reinforced, /obj/machinery/defibrillator_mount/loaded, +/obj/item/eftpos, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -86583,6 +86712,9 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "bluefull" }, @@ -89309,6 +89441,7 @@ pixel_y = 6 }, /obj/item/stack/packageWrap, +/obj/item/eftpos, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whitepurple"; @@ -92951,6 +93084,9 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, /obj/item/deck/cards, +/obj/item/eftpos{ + pixel_y = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -93951,6 +94087,9 @@ pixel_x = -2; pixel_y = 4 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -94772,6 +94911,9 @@ pixel_x = -4; pixel_y = 2 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -96767,6 +96909,10 @@ name = "south station intercom (General)"; pixel_y = -22 }, +/obj/item/eftpos{ + pixel_x = 9; + pixel_y = 11 + }, /turf/simulated/floor/wood, /area/crew_quarters/courtroom) "vUB" = ( @@ -100049,7 +100195,7 @@ /area/space) "xut" = ( /obj/machinery/computer/security/wooden_tv{ - network = list("SS13","Research Outpost","Mining Outpost") + network = list("SS13","Research Outpost","Mining Outpost") }, /obj/item/radio/intercom/department/security{ dir = 8; @@ -100138,6 +100284,9 @@ /obj/structure/sign/poster/official/random{ pixel_y = 32 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/transparent/glass/reinforced, /area/maintenance/apmaint) "xwE" = ( @@ -100925,6 +101074,7 @@ pixel_x = 8; pixel_y = 2 }, +/obj/item/eftpos, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitepurple" @@ -101123,6 +101273,13 @@ dir = 4 }, /obj/structure/table/glass, +/obj/item/eftpos{ + pixel_x = 9; + pixel_y = 11 + }, +/obj/item/eftpos{ + pixel_y = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "darkbluefull" }, @@ -147457,7 +147614,7 @@ bmG boy bcp brA -btl +iMg buV blj bCS From 9f2fbb73cb40e78d773246452208d2912fd15128 Mon Sep 17 00:00:00 2001 From: Peter Date: Wed, 19 Jul 2023 17:00:32 +0300 Subject: [PATCH 2/3] Revert "Map update: Cyberiad: EFTPOS population" This reverts commit 020c838438ec0bc8ae89fd82adc4adae57563595. --- _maps/map_files/cyberiad/cyberiad.dmm | 187 +++----------------------- 1 file changed, 15 insertions(+), 172 deletions(-) diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index d62e0009af1..4958c1a19f4 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -1191,7 +1191,7 @@ "aeV" = ( /obj/machinery/computer/security{ dir = 8; - network = list("SS13","Research Outpost","Mining Outpost") + network = list("SS13","Research Outpost","Mining Outpost") }, /obj/item/radio/intercom{ name = "custom station intercom (General)"; @@ -3759,9 +3759,6 @@ pixel_x = -8; pixel_y = 12 }, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "escape" @@ -3864,7 +3861,7 @@ "amR" = ( /obj/machinery/computer/security{ dir = 8; - network = list("SS13","Research Outpost","Mining Outpost") + network = list("SS13","Research Outpost","Mining Outpost") }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -4913,7 +4910,7 @@ "api" = ( /obj/machinery/computer/security{ dir = 8; - network = list("SS13","Research Outpost","Mining Outpost") + network = list("SS13","Research Outpost","Mining Outpost") }, /obj/machinery/light{ dir = 4 @@ -5614,7 +5611,7 @@ "arl" = ( /obj/machinery/computer/security{ dir = 4; - network = list("SS13","Research Outpost","Mining Outpost") + network = list("SS13","Research Outpost","Mining Outpost") }, /turf/simulated/floor/plasteel{ dir = 8; @@ -6212,7 +6209,7 @@ /area/security/brig) "asw" = ( /obj/machinery/computer/security{ - network = list("SS13","Research Outpost","Mining Outpost") + network = list("SS13","Research Outpost","Mining Outpost") }, /obj/machinery/computer/security/telescreen{ desc = "Used for watching Prison Wing holding areas."; @@ -11338,9 +11335,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -12466,9 +12460,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = -32 }, -/obj/item/eftpos{ - pixel_y = 11 - }, /turf/simulated/floor/plasteel{ icon_state = "barber" }, @@ -17589,7 +17580,7 @@ pixel_y = 30 }, /obj/machinery/computer/security{ - network = list("SS13","Research Outpost","Mining Outpost") + network = list("SS13","Research Outpost","Mining Outpost") }, /turf/simulated/floor/plasteel{ dir = 1; @@ -17809,7 +17800,6 @@ /area/crew_quarters/dorms) "aWD" = ( /obj/structure/table/wood, -/obj/item/eftpos, /turf/simulated/floor/carpet, /area/crew_quarters/dorms) "aWE" = ( @@ -20108,9 +20098,6 @@ pixel_x = 6; pixel_y = 12 }, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plasteel, /area/storage/primary) "bdc" = ( @@ -20690,10 +20677,6 @@ pixel_x = -2; pixel_y = 5 }, -/obj/item/eftpos{ - pixel_x = 9; - pixel_y = 11 - }, /turf/simulated/floor/carpet/black, /area/chapel/office) "bet" = ( @@ -20786,7 +20769,6 @@ name = "north newscaster"; pixel_y = 34 }, -/obj/item/eftpos, /turf/simulated/floor/light{ icon_state = "light_on-p"; state = 7 @@ -22089,10 +22071,6 @@ /obj/machinery/reagentgrinder{ pixel_y = 8 }, -/obj/item/eftpos{ - pixel_x = 9 - }, -/obj/item/eftpos, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -25010,9 +24988,6 @@ /obj/structure/table/reinforced, /obj/item/flash, /obj/item/flash, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plasteel, /area/bridge) "bps" = ( @@ -25553,7 +25528,7 @@ /area/bridge) "bqQ" = ( /obj/machinery/computer/security{ - network = list("SS13","Research Outpost","Mining Outpost","Telecomms") + network = list("SS13","Research Outpost","Mining Outpost","Telecomms") }, /obj/machinery/camera{ c_tag = "Bridge West" @@ -30110,9 +30085,6 @@ "bDy" = ( /obj/item/storage/fancy/donut_box, /obj/structure/table/wood, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bDB" = ( @@ -31597,7 +31569,6 @@ /obj/item/toy/figure/roboticist{ pixel_y = 8 }, -/obj/item/eftpos, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitepurple" @@ -32104,7 +32075,6 @@ name = "east station intercom (General)"; pixel_x = 22 }, -/obj/item/eftpos, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple"; @@ -34728,9 +34698,6 @@ pixel_y = -2 }, /obj/item/stamp/hop, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/wood, /area/crew_quarters/heads) "bTd" = ( @@ -34879,9 +34846,6 @@ amount = 50 }, /obj/item/multitool, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plasteel, /area/quartermaster/office) "bTC" = ( @@ -35316,7 +35280,7 @@ /obj/machinery/computer/security/telescreen{ desc = "Used for watching the RD's goons from the safety of his office."; name = "Research Monitor"; - network = list("Research","Research Outpost","RD"); + network = list("Research","Research Outpost","RD"); pixel_y = 2 }, /obj/structure/table/glass, @@ -37093,9 +37057,6 @@ /obj/item/grenade/chem_grenade/cleaner, /obj/item/grenade/chem_grenade/cleaner, /obj/item/grenade/chem_grenade/cleaner, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plasteel, /area/janitor) "ccS" = ( @@ -37288,9 +37249,6 @@ name = "Cargo Requests Console"; pixel_x = -30 }, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "cdz" = ( @@ -37348,9 +37306,6 @@ layer = 4; pixel_y = 32 }, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plasteel, /area/engine/break_room) "cdH" = ( @@ -38412,10 +38367,6 @@ /obj/structure/table, /obj/item/coin/silver, /obj/item/toy/figure/qm, -/obj/item/eftpos{ - pixel_x = 9; - pixel_y = 11 - }, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "ciy" = ( @@ -39671,10 +39622,6 @@ name = "south bump"; pixel_y = -26 }, -/obj/item/eftpos{ - pixel_x = 9; - pixel_y = 11 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -41193,7 +41140,7 @@ "cxg" = ( /obj/machinery/computer/general_air_control{ name = "Tank Monitor"; - sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous Oxide","waste_sensor"="Gas Mix Tank") + sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous Oxide","waste_sensor"="Gas Mix Tank") }, /turf/simulated/floor/plasteel{ dir = 4; @@ -41258,7 +41205,7 @@ frequency = 1443; level = 3; name = "Distribution and Waste Monitor"; - sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop") + sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop") }, /obj/structure/cable{ icon_state = "2-8" @@ -41611,9 +41558,6 @@ "cyG" = ( /obj/structure/table, /obj/item/t_scanner, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" @@ -42004,7 +41948,7 @@ frequency = 1443; level = 3; name = "Distribution and Waste Monitor"; - sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop") + sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop") }, /turf/simulated/floor/plasteel, /area/engine/controlroom) @@ -46332,7 +46276,6 @@ pixel_y = 9 }, /obj/machinery/light, -/obj/item/eftpos, /turf/simulated/floor/plasteel, /area/engine/break_room) "cOi" = ( @@ -48024,7 +47967,6 @@ pixel_x = 8; pixel_y = 14 }, -/obj/item/eftpos, /turf/simulated/floor/carpet/purple, /area/crew_quarters/hor) "cSi" = ( @@ -49014,9 +48956,6 @@ /obj/machinery/camera{ c_tag = "Engineering North-West" }, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plasteel, /area/engine/engineering) "cUk" = ( @@ -58539,7 +58478,7 @@ "dTM" = ( /obj/machinery/computer/general_air_control{ name = "Tank Monitor"; - sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous Oxide","waste_sensor"="Gas Mix Tank") + sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous Oxide","waste_sensor"="Gas Mix Tank") }, /obj/machinery/alarm{ pixel_y = 26 @@ -59334,9 +59273,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/carpet, /area/medical/psych) "elD" = ( @@ -59916,7 +59852,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/item/eftpos, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -59982,9 +59917,6 @@ /obj/structure/table/reinforced, /obj/item/pen, /obj/item/paper_bin/nanotrasen, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -60673,9 +60605,6 @@ name = "north station intercom (General)"; pixel_y = 22 }, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "arrival" @@ -64602,7 +64531,6 @@ pixel_y = 6 }, /obj/item/melee/chainofcommand, -/obj/item/eftpos, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -64815,9 +64743,6 @@ "gQY" = ( /obj/structure/table/reinforced, /obj/machinery/defibrillator_mount/loaded, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -68605,14 +68530,6 @@ icon_state = "darkpurple" }, /area/toxins/mixing) -"iMg" = ( -/obj/structure/table/wood, -/obj/item/eftpos{ - pixel_x = 9; - pixel_y = 11 - }, -/turf/simulated/floor/wood, -/area/library) "iMs" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -69493,9 +69410,6 @@ /obj/item/folder/yellow, /obj/item/eftpos, /obj/item/storage/belt/utility, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plasteel, /area/quartermaster/office) "jiV" = ( @@ -70379,9 +70293,6 @@ name = "east light switch"; pixel_x = 24 }, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -72179,7 +72090,6 @@ pixel_x = -5; pixel_y = 8 }, -/obj/item/eftpos, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -73635,9 +73545,6 @@ name = "north station intercom (General)"; pixel_y = 22 }, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "lae" = ( @@ -75311,9 +75218,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -75789,9 +75693,6 @@ name = "east fire alarm"; pixel_x = 24 }, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, @@ -76255,10 +76156,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/item/eftpos{ - pixel_x = 9; - pixel_y = 11 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" @@ -77877,7 +77774,6 @@ pixel_x = 6; pixel_y = 10 }, -/obj/item/eftpos, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whiteblue" @@ -79428,10 +79324,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/eftpos, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -79529,10 +79421,6 @@ pixel_x = 26 }, /obj/item/paper_bin/nanotrasen, -/obj/item/eftpos{ - pixel_x = 9; - pixel_y = 11 - }, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -80243,9 +80131,6 @@ name = "east fire alarm"; pixel_x = 24 }, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/carpet, /area/civilian/vacantoffice) "nXr" = ( @@ -81070,9 +80955,6 @@ c_tag = "Brig Briefing Room West"; dir = 4 }, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plasteel, /area/security/main) "ouy" = ( @@ -82731,9 +82613,6 @@ req_access = list(2) }, /obj/effect/spawner/lootdrop/maintenance, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plating, /area/maintenance/secpost) "pkG" = ( @@ -82773,7 +82652,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/eftpos, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -85385,7 +85263,7 @@ dir = 1; frequency = 1222; name = "Mixing Chamber Monitor"; - sensors = list("toxins_mixing_exterior"="Mixing Chamber - Exterior","toxins_mixing_interior"="Mixing Chamber - Interior") + sensors = list("toxins_mixing_exterior"="Mixing Chamber - Exterior","toxins_mixing_interior"="Mixing Chamber - Interior") }, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" @@ -85492,9 +85370,6 @@ /obj/item/clothing/glasses/welding{ pixel_y = 16 }, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plasteel, /area/atmos) "qww" = ( @@ -86142,9 +86017,6 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plating, /area/maintenance/engrooms) "qMf" = ( @@ -86647,7 +86519,6 @@ "qXZ" = ( /obj/structure/table/reinforced, /obj/machinery/defibrillator_mount/loaded, -/obj/item/eftpos, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -86712,9 +86583,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plasteel{ icon_state = "bluefull" }, @@ -89441,7 +89309,6 @@ pixel_y = 6 }, /obj/item/stack/packageWrap, -/obj/item/eftpos, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whitepurple"; @@ -93084,9 +92951,6 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, /obj/item/deck/cards, -/obj/item/eftpos{ - pixel_y = 11 - }, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -94087,9 +93951,6 @@ pixel_x = -2; pixel_y = 4 }, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -94911,9 +94772,6 @@ pixel_x = -4; pixel_y = 2 }, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -96909,10 +96767,6 @@ name = "south station intercom (General)"; pixel_y = -22 }, -/obj/item/eftpos{ - pixel_x = 9; - pixel_y = 11 - }, /turf/simulated/floor/wood, /area/crew_quarters/courtroom) "vUB" = ( @@ -100195,7 +100049,7 @@ /area/space) "xut" = ( /obj/machinery/computer/security/wooden_tv{ - network = list("SS13","Research Outpost","Mining Outpost") + network = list("SS13","Research Outpost","Mining Outpost") }, /obj/item/radio/intercom/department/security{ dir = 8; @@ -100284,9 +100138,6 @@ /obj/structure/sign/poster/official/random{ pixel_y = 32 }, -/obj/item/eftpos{ - pixel_x = 9 - }, /turf/simulated/floor/transparent/glass/reinforced, /area/maintenance/apmaint) "xwE" = ( @@ -101074,7 +100925,6 @@ pixel_x = 8; pixel_y = 2 }, -/obj/item/eftpos, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitepurple" @@ -101273,13 +101123,6 @@ dir = 4 }, /obj/structure/table/glass, -/obj/item/eftpos{ - pixel_x = 9; - pixel_y = 11 - }, -/obj/item/eftpos{ - pixel_y = 11 - }, /turf/simulated/floor/plasteel{ icon_state = "darkbluefull" }, @@ -147614,7 +147457,7 @@ bmG boy bcp brA -iMg +btl buV blj bCS From e50010a481e6725d7826bd2e5956e3ca56996053 Mon Sep 17 00:00:00 2001 From: Peter Date: Wed, 19 Jul 2023 17:10:45 +0300 Subject: [PATCH 3/3] Map update: Cyberiad: EFTPOS placement. Placed terminals on Cyberiad map for new economics update. --- _maps/map_files/cyberiad/cyberiad.dmm | 230 +++++++++++++++++++++++++- 1 file changed, 226 insertions(+), 4 deletions(-) diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 4958c1a19f4..cb36464424b 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -4881,6 +4881,9 @@ "apf" = ( /obj/structure/table, /obj/machinery/recharger, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, @@ -5131,6 +5134,9 @@ /obj/item/cartridge/detective{ pixel_x = -10 }, +/obj/item/eftpos{ + pixel_y = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -10841,6 +10847,9 @@ /obj/item/desk_bell{ anchored = 1 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/wood{ broken = 1; icon_state = "wood-broken" @@ -11351,6 +11360,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/item/eftpos, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -12157,6 +12167,9 @@ "aHr" = ( /obj/structure/table, /obj/item/melee/baseball_bat, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint) "aHt" = ( @@ -17800,6 +17813,7 @@ /area/crew_quarters/dorms) "aWD" = ( /obj/structure/table/wood, +/obj/item/eftpos, /turf/simulated/floor/carpet, /area/crew_quarters/dorms) "aWE" = ( @@ -18620,6 +18634,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/item/eftpos{ + pixel_y = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -20098,6 +20115,9 @@ pixel_x = 6; pixel_y = 12 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel, /area/storage/primary) "bdc" = ( @@ -20769,6 +20789,9 @@ name = "north newscaster"; pixel_y = 34 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/light{ icon_state = "light_on-p"; state = 7 @@ -22071,6 +22094,10 @@ /obj/machinery/reagentgrinder{ pixel_y = 8 }, +/obj/item/eftpos{ + pixel_x = 9 + }, +/obj/item/eftpos, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -24988,6 +25015,9 @@ /obj/structure/table/reinforced, /obj/item/flash, /obj/item/flash, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel, /area/bridge) "bps" = ( @@ -26390,6 +26420,9 @@ pixel_x = 4; pixel_y = 4 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/carpet, /area/civilian/vacantoffice) "btI" = ( @@ -26600,6 +26633,9 @@ /obj/structure/table, /obj/item/apc_electronics, /obj/item/airlock_electronics, +/obj/item/eftpos{ + pixel_y = 11 + }, /turf/simulated/floor/plasteel, /area/storage/tools) "bum" = ( @@ -28919,6 +28955,9 @@ pixel_y = 4 }, /obj/structure/table/wood, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bzP" = ( @@ -29427,6 +29466,10 @@ dir = 4 }, /obj/machinery/recharger, +/obj/item/eftpos{ + pixel_x = 9; + pixel_y = 11 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "arrival" @@ -33532,6 +33575,9 @@ pixel_x = -6; pixel_y = 4 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/carpet, /area/crew_quarters/captain/bedroom) "bOK" = ( @@ -33733,6 +33779,7 @@ pixel_x = -3; pixel_y = 2 }, +/obj/item/eftpos, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple"; @@ -37057,6 +37104,9 @@ /obj/item/grenade/chem_grenade/cleaner, /obj/item/grenade/chem_grenade/cleaner, /obj/item/grenade/chem_grenade/cleaner, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel, /area/janitor) "ccS" = ( @@ -37249,6 +37299,12 @@ name = "Cargo Requests Console"; pixel_x = -30 }, +/obj/item/eftpos{ + pixel_x = 9 + }, +/obj/item/eftpos{ + pixel_y = 11 + }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "cdz" = ( @@ -37306,6 +37362,9 @@ layer = 4; pixel_y = 32 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "cdH" = ( @@ -39928,6 +39987,9 @@ pixel_x = -5; pixel_y = 12 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/carpet, /area/ntrep) "cqT" = ( @@ -41558,6 +41620,9 @@ "cyG" = ( /obj/structure/table, /obj/item/t_scanner, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" @@ -42103,6 +42168,9 @@ /obj/structure/table, /obj/machinery/recharger, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel, /area/engine/controlroom) "cAS" = ( @@ -44157,6 +44225,9 @@ "cHS" = ( /obj/structure/table, /obj/item/book/manual/supermatter_engine, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "cHT" = ( @@ -47967,6 +48038,9 @@ pixel_x = 8; pixel_y = 14 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/carpet/purple, /area/crew_quarters/hor) "cSi" = ( @@ -48222,6 +48296,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/spawner/lootdrop/officetoys, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -51141,6 +51218,10 @@ pixel_y = -24; req_access = list(62) }, +/obj/item/eftpos{ + pixel_x = 9; + pixel_y = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -54777,6 +54858,9 @@ "djY" = ( /obj/structure/table/reinforced, /obj/machinery/reagentgrinder, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -57523,6 +57607,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/item/eftpos{ + pixel_x = 9; + pixel_y = 11 + }, /turf/simulated/floor/wood, /area/crew_quarters/mrchangs) "dwo" = ( @@ -59273,6 +59361,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/carpet, /area/medical/psych) "elD" = ( @@ -59852,6 +59943,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/item/eftpos{ + pixel_x = 9; + pixel_y = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -59917,6 +60012,9 @@ /obj/structure/table/reinforced, /obj/item/pen, /obj/item/paper_bin/nanotrasen, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -63495,6 +63593,9 @@ /obj/item/pen{ pixel_y = 8 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/wood, /area/crew_quarters/heads) "gjk" = ( @@ -64248,6 +64349,17 @@ icon_state = "darkred" }, /area/maintenance/secpost) +"gDN" = ( +/obj/structure/table/reinforced, +/obj/item/flashlight/lamp, +/obj/item/eftpos{ + pixel_x = 9; + pixel_y = 11 + }, +/turf/simulated/floor/plasteel{ + icon_state = "cult" + }, +/area/lawoffice) "gEd" = ( /obj/machinery/firealarm{ dir = 8; @@ -64743,6 +64855,9 @@ "gQY" = ( /obj/structure/table/reinforced, /obj/machinery/defibrillator_mount/loaded, +/obj/item/eftpos{ + pixel_y = 11 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -68227,6 +68342,9 @@ pixel_y = 6 }, /obj/item/lighter/zippo, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "iFI" = ( @@ -68503,6 +68621,10 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/item/eftpos{ + pixel_x = 9; + pixel_y = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -69410,6 +69532,9 @@ /obj/item/folder/yellow, /obj/item/eftpos, /obj/item/storage/belt/utility, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel, /area/quartermaster/office) "jiV" = ( @@ -69708,6 +69833,13 @@ /obj/item/stack/cable_coil/cut, /turf/simulated/floor/plating, /area/maintenance/livingcomplex) +"jov" = ( +/obj/structure/table/wood, +/obj/item/eftpos{ + pixel_y = 11 + }, +/turf/simulated/floor/wood, +/area/library) "joE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -70293,6 +70425,9 @@ name = "east light switch"; pixel_x = 24 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -71395,6 +71530,9 @@ /obj/item/folder, /obj/item/pen, /obj/effect/spawner/lootdrop/maintenance, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "carpet" }, @@ -72090,6 +72228,9 @@ pixel_x = -5; pixel_y = 8 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -73358,6 +73499,10 @@ pixel_x = -3; pixel_y = 3 }, +/obj/item/eftpos{ + pixel_x = 9; + pixel_y = 11 + }, /turf/simulated/floor/plasteel, /area/quartermaster/office) "kWW" = ( @@ -73545,6 +73690,10 @@ name = "north station intercom (General)"; pixel_y = 22 }, +/obj/item/eftpos{ + pixel_x = 9; + pixel_y = 11 + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "lae" = ( @@ -74737,6 +74886,14 @@ icon_state = "redcorner" }, /area/security/permabrig) +"lyq" = ( +/obj/structure/table, +/obj/effect/spawner/lootdrop/maintenance, +/obj/item/eftpos{ + pixel_x = 9 + }, +/turf/simulated/floor/plating, +/area/maintenance/fpmaint) "lyz" = ( /obj/machinery/computer/operating{ dir = 1 @@ -75111,6 +75268,9 @@ pixel_y = 9 }, /obj/structure/table, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -76156,6 +76316,10 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/item/eftpos{ + pixel_x = 9; + pixel_y = 11 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" @@ -77774,6 +77938,9 @@ pixel_x = 6; pixel_y = 10 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whiteblue" @@ -81414,6 +81581,9 @@ name = "west extinguisher cabinet"; pixel_x = -24 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteyellow" @@ -83143,6 +83313,10 @@ pixel_y = 7 }, /obj/item/pen, +/obj/item/eftpos{ + pixel_x = 9; + pixel_y = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -85851,6 +86025,15 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint) +"qGG" = ( +/obj/structure/table, +/obj/item/storage/fancy/donut_box, +/obj/item/eftpos{ + pixel_x = 9 + }, +/obj/item/eftpos, +/turf/simulated/floor/plasteel, +/area/security/main) "qGL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -86519,6 +86702,11 @@ "qXZ" = ( /obj/structure/table/reinforced, /obj/machinery/defibrillator_mount/loaded, +/obj/item/eftpos{ + pixel_x = 9; + pixel_y = 11 + }, +/obj/item/eftpos, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -87840,6 +88028,10 @@ name = "east light switch"; pixel_x = 24 }, +/obj/item/eftpos{ + pixel_x = 9; + pixel_y = 11 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkpurple" @@ -89309,6 +89501,10 @@ pixel_y = 6 }, /obj/item/stack/packageWrap, +/obj/item/eftpos, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whitepurple"; @@ -90607,6 +90803,10 @@ c_tag = "Research Break Room"; network = list("Research","SS13") }, +/obj/item/eftpos{ + pixel_x = 9; + pixel_y = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -90925,6 +91125,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "whitegreenfull" }, @@ -92951,6 +93154,9 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, /obj/item/deck/cards, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -94772,6 +94978,9 @@ pixel_x = -4; pixel_y = 2 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -95574,6 +95783,9 @@ /obj/machinery/light{ dir = 4 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/plating, /area/maintenance/engrooms) "vpG" = ( @@ -96124,6 +96336,9 @@ pixel_y = 4 }, /obj/structure/table/glass, +/obj/item/eftpos{ + pixel_y = 11 + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkpurple" @@ -96767,6 +96982,9 @@ name = "south station intercom (General)"; pixel_y = -22 }, +/obj/item/eftpos{ + pixel_x = 9 + }, /turf/simulated/floor/wood, /area/crew_quarters/courtroom) "vUB" = ( @@ -100925,6 +101143,10 @@ pixel_x = 8; pixel_y = 2 }, +/obj/item/eftpos{ + pixel_x = 9; + pixel_y = 11 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitepurple" @@ -119425,7 +119647,7 @@ aPi aPi aPi aPj -aQe +lyq aPi aYa aMA @@ -127891,7 +128113,7 @@ aod avW aod aIo -aoe +gDN nCF aIo aDg @@ -134560,7 +134782,7 @@ aeu hJq aoJ aoL -aoR +qGG aqA aqX aiS @@ -147457,7 +147679,7 @@ bmG boy bcp brA -btl +jov buV blj bCS