diff --git a/code/_helpers/icons.dm b/code/_helpers/icons.dm index b82e18907c1..d7ef4d8e93f 100644 --- a/code/_helpers/icons.dm +++ b/code/_helpers/icons.dm @@ -672,6 +672,7 @@ // For determining the color of holopads based on whether they're short or long range. #define HOLOPAD_SHORT_RANGE 1 #define HOLOPAD_LONG_RANGE 2 +#define HOLOPAD_AVERAGE_RANGE 3 // If safety is on, a new icon is not created. /proc/getHologramIcon(icon/A, safety = 1, noDecolor = FALSE, hologram_color = HOLOPAD_SHORT_RANGE) @@ -680,6 +681,8 @@ if (noDecolor == FALSE) if(hologram_color == HOLOPAD_LONG_RANGE) flat_icon.ColorTone(rgb(225, 223, 125)) // Light yellow if it's a call to a long-range holopad. + else if (hologram_color == HOLOPAD_AVERAGE_RANGE) + flat_icon.ColorTone(rgb(225, 125, 125)) else flat_icon.ColorTone(rgb(125, 180, 225)) // Let's make it bluish. flat_icon.ChangeOpacity(0.5) // Make it half transparent. diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 26084819cad..386dd08bba5 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -69,11 +69,11 @@ //alternate button with the same functionality, except has a door control sprite instead /obj/machinery/button/alternate icon = 'icons/obj/stationobjs.dmi' - icon_state = "doorctrl0" + icon_state = "doorctrl" /obj/machinery/button/alternate/on_update_icon() if(active) - icon_state = "doorctrl0" + icon_state = "doorctrl" else icon_state = "doorctrl2" @@ -105,11 +105,11 @@ //alternate button with the same toggle functionality, except has a door control sprite instead /obj/machinery/button/toggle/alternate icon = 'icons/obj/stationobjs.dmi' - icon_state = "doorctrl0" + icon_state = "doorctrl" /obj/machinery/button/toggle/alternate/on_update_icon() if(active) - icon_state = "doorctrl0" + icon_state = "doorctrl" else icon_state = "doorctrl2" diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index c485d699041..4bd8e6d3508 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -5,7 +5,7 @@ name = "Door" desc = "It opens and closes." icon = 'icons/obj/doors/doorint.dmi' - icon_state = "door1" + icon_state = "door_closed" anchored = 1 opacity = 1 density = 1 @@ -363,9 +363,9 @@ /obj/machinery/door/on_update_icon() if(density) - icon_state = "door1" + icon_state = "door_closed" else - icon_state = "door0" + icon_state = "door_open" return @@ -398,7 +398,7 @@ operating = TRUE do_animate("opening") - icon_state = "door0" + icon_state = "door_opening" set_opacity(FALSE) if(filler) filler.set_opacity(opacity) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index ffe9e8f9607..3f95da77521 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -60,7 +60,7 @@ var/const/HOLOPAD_MODE = RANGE_BASED /obj/machinery/hologram/holopad/New() ..() - desc = "It's a floor-mounted device for projecting holographic images. Its ID is '[loc.loc]'" + desc += " Its ID is '[loc.loc]'" /obj/machinery/hologram/holopad/attack_hand(mob/living/carbon/human/user) //Carn: Hologram requests. if(!istype(user)) @@ -389,11 +389,13 @@ Holographic project of everything else. /* * Other Stuff: Is this even used? */ -/obj/machinery/hologram/projector - name = "hologram projector" - desc = "It makes a hologram appear...with magnets or something..." - icon = 'icons/obj/stationobjs.dmi' - icon_state = "hologram0" +/obj/machinery/hologram/holopad/projector + name = "holopad projector" + desc = "It's a floor-mounted device for projecting holographic images. This one has hologram appear...with magnets or something..." + icon_state = "holopad0" + map_range = 1 + holopadType = HOLOPAD_AVERAGE_RANGE + base_icon = "holopad" /obj/machinery/hologram/holopad/longrange name = "long range holopad" diff --git a/code/game/objects/effects/decals/Cleanable/fuel.dm b/code/game/objects/effects/decals/Cleanable/fuel.dm index 1eddf760f4a..baad2a5a337 100644 --- a/code/game/objects/effects/decals/Cleanable/fuel.dm +++ b/code/game/objects/effects/decals/Cleanable/fuel.dm @@ -1,7 +1,7 @@ /obj/effect/decal/cleanable/liquid_fuel //Liquid fuel is used for things that used to rely on volatile fuels or plasma being contained to a couple tiles. icon = 'icons/effects/effects.dmi' - icon_state = "fuel" + icon_state = "liquid" //By design it should have a unique sprite "fuel", however in this implementation it has a ‘liquid’ sprite. You can draw something else in the future. layer = BLOOD_LAYER var/amount = 1 diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index bd659cb0d70..bb59266c610 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -169,7 +169,7 @@ var/global/list/image/splatter_cache=list() density = 0 anchored = 1 icon = 'icons/effects/blood.dmi' - icon_state = "gibbl5" + icon_state = "gibbl" random_icon_states = list("gib1", "gib2", "gib3", "gib5", "gib6") var/fleshcolor = "#ffffff" diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 623f7f8c471..15a1727f8ac 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -269,8 +269,8 @@ slot_flags = SLOT_EARS /obj/effect/foam_dart_dummy - name = "" - desc = "" + name = "foam dart dummy" + desc = "foam dart dummy: A simple target to practice your dart shooting skills." icon = 'icons/obj/toy.dmi' icon_state = "null" anchored = 1 diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 400ae75747b..c6cb4889789 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -585,7 +585,6 @@ /obj/item/shockpaddles/standalone/traitor name = "defibrillator paddles" desc = "A pair of unusual looking paddles powered by an experimental miniaturized reactor. It possesses both the ability to penetrate armor and to deliver powerful shocks." - icon = 'icons/obj/weapons.dmi' icon_state = "defibpaddles0" item_state = "defibpaddles0" combat = 1 diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm index 80ea35e92a9..20aa4785b86 100644 --- a/code/modules/clothing/under/accessories/armor.dm +++ b/code/modules/clothing/under/accessories/armor.dm @@ -192,7 +192,7 @@ name = "master armor tag" desc = "A collection of various tags for placing on the front of a plate carrier." icon = 'icons/obj/clothing/modular_armor.dmi' - icon_state = "null" + icon_state = "tag" slot = ACCESSORY_SLOT_ARMOR_M /obj/item/clothing/accessory/armor/tag/nt @@ -250,7 +250,7 @@ name = "helmet cover" desc = "A fabric cover for armored helmets." icon = 'icons/obj/clothing/modular_armor.dmi' - icon_state = "null" + icon_state = "helmcover" slot = ACCESSORY_SLOT_HELM_C /obj/item/clothing/accessory/armor/helmcover/blue diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 37545eb28db..9e2de34d68a 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -16,7 +16,7 @@ GLOBAL_LIST_INIT(robot_modules, list( /obj/item/robot_module name = "robot module" icon = 'icons/obj/module.dmi' - icon_state = "std_module" + icon_state = "std_mod" w_class = ITEM_SIZE_NO_CONTAINER item_state = "electronic" obj_flags = OBJ_FLAG_CONDUCTIBLE diff --git a/code/modules/tables/rack.dm b/code/modules/tables/rack.dm index e52494cb3ed..1e88eafefc3 100644 --- a/code/modules/tables/rack.dm +++ b/code/modules/tables/rack.dm @@ -28,14 +28,10 @@ /obj/structure/table/rack/can_connect() return FALSE +/obj/structure/table/rack/dark + color = COLOR_GRAY40 + /obj/structure/table/rack/bograck name = "strange rack" - desc ="Must be the color." - icon = 'icons/obj/objects.dmi' + desc = "Must be the color." icon_state = "bograck" - can_plate = 0 - can_reinforce = 0 - flipped = -1 - -/obj/structure/table/rack/dark - color = COLOR_GRAY40 diff --git a/icons/atmos/manifold.dmi b/icons/atmos/manifold.dmi index b7c5d0a2f14..26cf6769b56 100644 Binary files a/icons/atmos/manifold.dmi and b/icons/atmos/manifold.dmi differ diff --git a/icons/atmos/pipes.dmi b/icons/atmos/pipes.dmi index 6bd0b15f618..c03a70dc02a 100644 Binary files a/icons/atmos/pipes.dmi and b/icons/atmos/pipes.dmi differ diff --git a/icons/effects/blood.dmi b/icons/effects/blood.dmi index 7e68c26ef52..eb8eb636ee7 100644 Binary files a/icons/effects/blood.dmi and b/icons/effects/blood.dmi differ diff --git a/icons/effects/fluidtracks.dmi b/icons/effects/fluidtracks.dmi index 534c7d47f8e..0ecd5663106 100644 Binary files a/icons/effects/fluidtracks.dmi and b/icons/effects/fluidtracks.dmi differ diff --git a/icons/hud/screen_spells.dmi b/icons/hud/screen_spells.dmi index e2486bc26bc..bbc35970063 100644 Binary files a/icons/hud/screen_spells.dmi and b/icons/hud/screen_spells.dmi differ diff --git a/icons/inv_slots/acessories/mob.dmi b/icons/inv_slots/acessories/mob.dmi index 55f6c0ab972..a7c06003986 100644 Binary files a/icons/inv_slots/acessories/mob.dmi and b/icons/inv_slots/acessories/mob.dmi differ diff --git a/icons/inv_slots/acessories/mob_fat.dmi b/icons/inv_slots/acessories/mob_fat.dmi index dffea5a2c38..2fca173f50f 100644 Binary files a/icons/inv_slots/acessories/mob_fat.dmi and b/icons/inv_slots/acessories/mob_fat.dmi differ diff --git a/icons/inv_slots/acessories/mob_slim.dmi b/icons/inv_slots/acessories/mob_slim.dmi index cfb0ec4226a..21b16d8d1d6 100644 Binary files a/icons/inv_slots/acessories/mob_slim.dmi and b/icons/inv_slots/acessories/mob_slim.dmi differ diff --git a/icons/inv_slots/acessories/mob_slim_m.dmi b/icons/inv_slots/acessories/mob_slim_m.dmi index e0902013dfe..66c81d0041f 100644 Binary files a/icons/inv_slots/acessories/mob_slim_m.dmi and b/icons/inv_slots/acessories/mob_slim_m.dmi differ diff --git a/icons/mob/alien.dmi b/icons/mob/alien.dmi index 668f60e5f59..fc5a7a7ff5b 100644 Binary files a/icons/mob/alien.dmi and b/icons/mob/alien.dmi differ diff --git a/icons/mob/hologram.dmi b/icons/mob/hologram.dmi index ad3a357c4d2..2435067f68a 100644 Binary files a/icons/mob/hologram.dmi and b/icons/mob/hologram.dmi differ diff --git a/icons/obj/assemblies/new_assemblies.dmi b/icons/obj/assemblies/new_assemblies.dmi index 21fd35659a2..e77a407d404 100644 Binary files a/icons/obj/assemblies/new_assemblies.dmi and b/icons/obj/assemblies/new_assemblies.dmi differ diff --git a/icons/obj/clothing/modular_armor.dmi b/icons/obj/clothing/modular_armor.dmi index 4fab3f5b7b0..a4026745296 100644 Binary files a/icons/obj/clothing/modular_armor.dmi and b/icons/obj/clothing/modular_armor.dmi differ diff --git a/icons/obj/defibrillator.dmi b/icons/obj/defibrillator.dmi index f399f37f4b3..5ce8a0f1472 100644 Binary files a/icons/obj/defibrillator.dmi and b/icons/obj/defibrillator.dmi differ diff --git a/icons/obj/hud_modules.dmi b/icons/obj/hud_modules.dmi index dbbb6d080fb..25bacb3c919 100644 Binary files a/icons/obj/hud_modules.dmi and b/icons/obj/hud_modules.dmi differ diff --git a/icons/obj/hydroponics_misc.dmi b/icons/obj/hydroponics_misc.dmi index a5c594d93ff..4cca49988f2 100644 Binary files a/icons/obj/hydroponics_misc.dmi and b/icons/obj/hydroponics_misc.dmi differ diff --git a/icons/obj/machines/particle_accelerator2.dmi b/icons/obj/machines/particle_accelerator2.dmi index a489510e554..bec7c4f7210 100644 Binary files a/icons/obj/machines/particle_accelerator2.dmi and b/icons/obj/machines/particle_accelerator2.dmi differ diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi index d6e048be22e..798b85ab6a5 100644 Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ diff --git a/icons/obj/playing_cards.dmi b/icons/obj/playing_cards.dmi index 2f4c01b7073..9efe42525ca 100644 Binary files a/icons/obj/playing_cards.dmi and b/icons/obj/playing_cards.dmi differ diff --git a/icons/obj/reagent_containers/glasses.dmi b/icons/obj/reagent_containers/glasses.dmi index 91f54721795..c02f28ca068 100644 Binary files a/icons/obj/reagent_containers/glasses.dmi and b/icons/obj/reagent_containers/glasses.dmi differ diff --git a/icons/obj/rig_modules.dmi b/icons/obj/rig_modules.dmi index 6fa6d90af19..152e563bbf6 100644 Binary files a/icons/obj/rig_modules.dmi and b/icons/obj/rig_modules.dmi differ diff --git a/icons/obj/singularity.dmi b/icons/obj/singularity.dmi index e309bc8f57a..763a7efff85 100644 Binary files a/icons/obj/singularity.dmi and b/icons/obj/singularity.dmi differ diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi index 47668f619d7..ed65f19b27e 100644 Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index 7b51d408c5f..744b662fdf5 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ diff --git a/icons/obj/xenoarchaeology.dmi b/icons/obj/xenoarchaeology.dmi index ddf2ccc83e1..f703fcb214f 100644 Binary files a/icons/obj/xenoarchaeology.dmi and b/icons/obj/xenoarchaeology.dmi differ diff --git a/maps/exodus/exodus-4.dmm b/maps/exodus/exodus-4.dmm index 7707824487e..890ccdef02a 100644 --- a/maps/exodus/exodus-4.dmm +++ b/maps/exodus/exodus-4.dmm @@ -726,7 +726,7 @@ "arB" = (/obj/item/clothing/gloves/insulated,/obj/item/device/assembly/signaler{pixel_y = 2},/obj/item/clothing/glasses/hud/scanners/night,/obj/structure/table/steel,/turf/simulated/floor/shuttle/darkred,/area/syndicate_station/start) "arC" = (/obj/item/clothing/gloves/insulated,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/clothing/glasses/hud/scanners/night,/obj/structure/table/steel,/turf/simulated/floor/shuttle/darkred,/area/syndicate_station/start) "arD" = (/obj/item/clothing/gloves/insulated,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/clothing/glasses/hud/scanners/night,/obj/machinery/light{dir = 4},/obj/structure/table/steel,/turf/simulated/floor/shuttle/darkred,/area/syndicate_station/start) -"arE" = (/obj/structure/table/steel_reinforced,/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl0"; pixel_y = -4; id = "rescuebridge"; req_access = list(108)},/turf/simulated/floor/shuttle/black,/area/rescue_base/start) +"arE" = (/obj/structure/table/steel_reinforced,/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl"; pixel_y = -4; id = "rescuebridge"; req_access = list(108)},/turf/simulated/floor/shuttle/black,/area/rescue_base/start) "arF" = (/obj/item/modular_computer/console/preset/command,/turf/simulated/floor/shuttle/black,/area/rescue_base/start) "arG" = (/obj/machinery/computer/shuttle_control/multi/rescue,/turf/simulated/floor/shuttle/black,/area/rescue_base/start) "arH" = (/obj/structure/table/steel_reinforced,/obj/machinery/recharger{pixel_y = 4},/obj/machinery/light{dir = 4},/turf/simulated/floor/shuttle/black,/area/rescue_base/start) @@ -1032,7 +1032,7 @@ "axw" = (/obj/machinery/door/blast/regular{name = "Assault Weapon Storage"; id = "ASSAULT"},/turf/unsimulated/floor{icon_state = "vault"; dir = 8},/area/centcom/specops) "axx" = (/obj/structure/table/rack,/obj/item/circuitboard/borgupload,/obj/item/circuitboard/aiupload{pixel_x = -3; pixel_y = -3},/turf/unsimulated/floor{icon_state = "vault"; dir = 8},/area/centcom/specops) "axy" = (/obj/structure/table/rack,/obj/item/storage/secure/briefcase,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter/zippo,/obj/item/storage/belt/utility,/obj/item/storage/backpack/satchel,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed) -"axz" = (/obj/structure/table/woodentable{dir = 10},/obj/machinery/button/remote/blast_door{name = "Spec Ops Ready Room"; pixel_x = -5; pixel_y = 4; id = "CREED"; req_access = list(108)},/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl0"; pixel_y = -4; id = "ASSAULT"; req_access = list(108)},/obj/machinery/button/remote/blast_door{name = "Synth Equipment"; pixel_x = 5; pixel_y = 4; id = "ert_synth_equipment"; req_access = list(108)},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed) +"axz" = (/obj/structure/table/woodentable{dir = 10},/obj/machinery/button/remote/blast_door{name = "Spec Ops Ready Room"; pixel_x = -5; pixel_y = 4; id = "CREED"; req_access = list(108)},/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl"; pixel_y = -4; id = "ASSAULT"; req_access = list(108)},/obj/machinery/button/remote/blast_door{name = "Synth Equipment"; pixel_x = 5; pixel_y = 4; id = "ert_synth_equipment"; req_access = list(108)},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed) "axA" = (/obj/machinery/turret/network/centcomm,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed) "axB" = (/obj/machinery/door/airlock/centcom{name = "Creed's Office"; opacity = 1; req_access = list(108)},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/creed) "axC" = (/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/control) diff --git a/maps/frontier/frontier-2.dmm b/maps/frontier/frontier-2.dmm index 3777c260c2a..2e22724dc76 100644 --- a/maps/frontier/frontier-2.dmm +++ b/maps/frontier/frontier-2.dmm @@ -694,7 +694,7 @@ "arB" = (/obj/item/clothing/gloves/insulated,/obj/item/device/assembly/signaler{pixel_y = 2},/obj/item/clothing/glasses/hud/scanners/night,/obj/structure/table/steel,/turf/simulated/floor/shuttle/darkred,/area/syndicate_station/start) "arC" = (/obj/item/clothing/gloves/insulated,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/clothing/glasses/hud/scanners/night,/obj/structure/table/steel,/turf/simulated/floor/shuttle/darkred,/area/syndicate_station/start) "arD" = (/obj/item/clothing/gloves/insulated,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/clothing/glasses/hud/scanners/night,/obj/machinery/light{dir = 4},/obj/structure/table/steel,/turf/simulated/floor/shuttle/darkred,/area/syndicate_station/start) -"arE" = (/obj/structure/table/steel_reinforced,/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl0"; pixel_y = -4; id = "rescuebridge"; req_access = list(108)},/turf/simulated/floor/shuttle/black,/area/rescue_base/start) +"arE" = (/obj/structure/table/steel_reinforced,/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl"; pixel_y = -4; id = "rescuebridge"; req_access = list(108)},/turf/simulated/floor/shuttle/black,/area/rescue_base/start) "arF" = (/obj/item/modular_computer/console/preset/command,/turf/simulated/floor/shuttle/black,/area/rescue_base/start) "arG" = (/obj/machinery/computer/shuttle_control/multi/rescue,/turf/simulated/floor/shuttle/black,/area/rescue_base/start) "arH" = (/obj/structure/table/steel_reinforced,/obj/machinery/recharger{pixel_y = 4},/obj/machinery/light{dir = 4},/turf/simulated/floor/shuttle/black,/area/rescue_base/start) @@ -997,7 +997,7 @@ "axw" = (/obj/machinery/door/blast/regular{name = "Assault Weapon Storage"; id = "ASSAULT"},/turf/unsimulated/floor{icon_state = "vault"; dir = 8},/area/centcom/specops) "axx" = (/obj/structure/table/rack,/obj/item/circuitboard/borgupload,/obj/item/circuitboard/aiupload{pixel_x = -3; pixel_y = -3},/turf/unsimulated/floor{icon_state = "vault"; dir = 8},/area/centcom/specops) "axy" = (/obj/structure/table/rack,/obj/item/storage/secure/briefcase,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter/zippo,/obj/item/storage/belt/utility,/obj/item/storage/backpack/satchel,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed) -"axz" = (/obj/structure/table/woodentable{dir = 10},/obj/machinery/button/remote/blast_door{name = "Spec Ops Ready Room"; pixel_x = -5; pixel_y = 4; id = "CREED"; req_access = list(108)},/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl0"; pixel_y = -4; id = "ASSAULT"; req_access = list(108)},/obj/machinery/button/remote/blast_door{name = "Synth Equipment"; pixel_x = 5; pixel_y = 4; id = "ert_synth_equipment"; req_access = list(108)},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed) +"axz" = (/obj/structure/table/woodentable{dir = 10},/obj/machinery/button/remote/blast_door{name = "Spec Ops Ready Room"; pixel_x = -5; pixel_y = 4; id = "CREED"; req_access = list(108)},/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl"; pixel_y = -4; id = "ASSAULT"; req_access = list(108)},/obj/machinery/button/remote/blast_door{name = "Synth Equipment"; pixel_x = 5; pixel_y = 4; id = "ert_synth_equipment"; req_access = list(108)},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed) "axA" = (/obj/item/stool/padded,/obj/structure/reagent_dispensers/peppertank{pixel_y = 32},/turf/unsimulated/floor{icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark_rough"; dir = 5},/area/centcom/holding) "axB" = (/obj/machinery/door/airlock/centcom{name = "Creed's Office"; opacity = 1; req_access = list(108)},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/creed) "axC" = (/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/control) diff --git a/maps/genesis/genesis-3.dmm b/maps/genesis/genesis-3.dmm index c1883c8fe09..1fef24affc5 100644 --- a/maps/genesis/genesis-3.dmm +++ b/maps/genesis/genesis-3.dmm @@ -703,7 +703,7 @@ "arB" = (/obj/item/clothing/gloves/insulated,/obj/item/device/assembly/signaler{pixel_y = 2},/obj/structure/table/steel,/turf/simulated/floor/shuttle/darkred,/area/syndicate_station/start) "arC" = (/obj/item/clothing/gloves/insulated,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/structure/table/steel,/turf/simulated/floor/shuttle/darkred,/area/syndicate_station/start) "arD" = (/obj/item/clothing/gloves/insulated,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/machinery/light{dir = 4},/obj/structure/table/steel,/turf/simulated/floor/shuttle/darkred,/area/syndicate_station/start) -"arE" = (/obj/structure/table/steel_reinforced,/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl0"; pixel_y = -4; id = "rescuebridge"; req_access = list(108)},/turf/simulated/floor/shuttle/black,/area/rescue_base/start) +"arE" = (/obj/structure/table/steel_reinforced,/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl"; pixel_y = -4; id = "rescuebridge"; req_access = list(108)},/turf/simulated/floor/shuttle/black,/area/rescue_base/start) "arF" = (/obj/item/modular_computer/console/preset/command,/turf/simulated/floor/shuttle/black,/area/rescue_base/start) "arG" = (/obj/machinery/computer/shuttle_control/multi/rescue,/turf/simulated/floor/shuttle/black,/area/rescue_base/start) "arH" = (/obj/structure/table/steel_reinforced,/obj/machinery/recharger{pixel_y = 4},/obj/machinery/light{dir = 4},/turf/simulated/floor/shuttle/black,/area/rescue_base/start) @@ -1006,7 +1006,7 @@ "axw" = (/obj/machinery/door/blast/regular{name = "Assault Weapon Storage"; id = "ASSAULT"},/turf/unsimulated/floor{icon_state = "vault"; dir = 8},/area/centcom/specops) "axx" = (/obj/structure/table/rack,/obj/item/circuitboard/borgupload,/obj/item/circuitboard/aiupload{pixel_x = -3; pixel_y = -3},/turf/unsimulated/floor{icon_state = "vault"; dir = 8},/area/centcom/specops) "axy" = (/obj/structure/table/rack,/obj/item/storage/secure/briefcase,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter/zippo,/obj/item/storage/belt/utility,/obj/item/storage/backpack/satchel,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed) -"axz" = (/obj/structure/table/woodentable{dir = 10},/obj/machinery/button/remote/blast_door{name = "Spec Ops Ready Room"; pixel_x = -5; pixel_y = 4; id = "CREED"; req_access = list(108)},/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl0"; pixel_y = -4; id = "ASSAULT"; req_access = list(108)},/obj/machinery/button/remote/blast_door{name = "Synth Equipment"; pixel_x = 5; pixel_y = 4; id = "ert_synth_equipment"; req_access = list(108)},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed) +"axz" = (/obj/structure/table/woodentable{dir = 10},/obj/machinery/button/remote/blast_door{name = "Spec Ops Ready Room"; pixel_x = -5; pixel_y = 4; id = "CREED"; req_access = list(108)},/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl"; pixel_y = -4; id = "ASSAULT"; req_access = list(108)},/obj/machinery/button/remote/blast_door{name = "Synth Equipment"; pixel_x = 5; pixel_y = 4; id = "ert_synth_equipment"; req_access = list(108)},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed) "axA" = (/obj/machinery/turret/network/centcomm,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed) "axB" = (/obj/machinery/door/airlock/centcom{name = "Creed's Office"; opacity = 1; req_access = list(108)},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/creed) "axC" = (/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/control) diff --git a/maps/polaris/polar-5.dmm b/maps/polaris/polar-5.dmm index 6b12b925a7a..efb5ad3202a 100644 --- a/maps/polaris/polar-5.dmm +++ b/maps/polaris/polar-5.dmm @@ -376,7 +376,7 @@ "ahZ" = (/obj/structure/window_frame/indestructible/hull,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/living) "aia" = (/turf/unsimulated/wall,/area/centcom/suppy) "aib" = (/turf/simulated/shuttle/wall/syndi{icon_state = "syndiwall_straight"; dir = 1},/area/polarplanet/rescue_base/start) -"aic" = (/obj/structure/table/steel_reinforced,/obj/machinery/button/remote/blast_door{icon_state = "doorctrl0"; id = "rescuebridge"; name = "Mech Storage"; pixel_y = -4; req_access = list(108)},/turf/simulated/floor/shuttle/black,/area/polarplanet/rescue_base/start) +"aic" = (/obj/structure/table/steel_reinforced,/obj/machinery/button/remote/blast_door{icon_state = "doorctrl"; id = "rescuebridge"; name = "Mech Storage"; pixel_y = -4; req_access = list(108)},/turf/simulated/floor/shuttle/black,/area/polarplanet/rescue_base/start) "aid" = (/obj/item/modular_computer/console/preset/command,/turf/simulated/floor/shuttle/black,/area/polarplanet/rescue_base/start) "aie" = (/obj/machinery/computer/shuttle_control/multi/rescue,/turf/simulated/floor/shuttle/black,/area/polarplanet/rescue_base/start) "aif" = (/obj/structure/table/steel_reinforced,/obj/machinery/recharger{pixel_y = 4},/obj/machinery/light{dir = 4},/turf/simulated/floor/shuttle/black,/area/polarplanet/rescue_base/start) @@ -623,7 +623,7 @@ "ann" = (/obj/machinery/door/blast/regular{id = "ASSAULT"; name = "Assault Weapon Storage"},/turf/unsimulated/floor{dir = 8; icon_state = "vault"},/area/centcom/specops) "ano" = (/obj/structure/table/rack,/obj/item/circuitboard/borgupload,/obj/item/circuitboard/aiupload{pixel_x = -3; pixel_y = -3},/turf/unsimulated/floor{dir = 8; icon_state = "vault"},/area/centcom/specops) "anp" = (/obj/structure/table/rack,/obj/item/storage/secure/briefcase,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter/zippo,/obj/item/storage/belt/utility,/obj/item/storage/backpack/satchel,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed) -"anq" = (/obj/structure/table/woodentable{dir = 10},/obj/machinery/button/remote/blast_door{id = "CREED"; name = "Spec Ops Ready Room"; pixel_x = -5; pixel_y = 4; req_access = list(108)},/obj/machinery/button/remote/blast_door{icon_state = "doorctrl0"; id = "ASSAULT"; name = "Mech Storage"; pixel_y = -4; req_access = list(108)},/obj/machinery/button/remote/blast_door{id = "ert_synth_equipment"; name = "Synth Equipment"; pixel_x = 5; pixel_y = 4; req_access = list(108)},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed) +"anq" = (/obj/structure/table/woodentable{dir = 10},/obj/machinery/button/remote/blast_door{id = "CREED"; name = "Spec Ops Ready Room"; pixel_x = -5; pixel_y = 4; req_access = list(108)},/obj/machinery/button/remote/blast_door{icon_state = "doorctrl"; id = "ASSAULT"; name = "Mech Storage"; pixel_y = -4; req_access = list(108)},/obj/machinery/button/remote/blast_door{id = "ert_synth_equipment"; name = "Synth Equipment"; pixel_x = 5; pixel_y = 4; req_access = list(108)},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed) "anr" = (/obj/effect/floor_decal/industrial/hatch/yellow,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed) "ans" = (/obj/machinery/door/airlock/centcom{name = "Creed's Office"; opacity = 1; req_access = list(108)},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/creed) "ant" = (/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/control)