From a59080f7ff1fc56a9c07d16dcb66abd652ffcc7b Mon Sep 17 00:00:00 2001 From: Odairu <39929315+Odairu@users.noreply.github.com> Date: Wed, 7 Aug 2024 03:04:49 -0400 Subject: [PATCH 1/8] Modularizing things (#1914) ## About The Pull Request does as the title says ## Why It's Good For The Game players wont notice this but it gets rid of a tiny bit of things that coulda been modular, but were not ## Proof Of Testing It compiles: dude trust me ## Changelog :cl: refactor: modularizes a few things /:cl: --- code/__DEFINES/dcs/signals/signals_object.dm | 1 - code/__DEFINES/~~bubber_defines/signals.dm | 2 ++ code/datums/components/squeak.dm | 2 -- code/modules/cargo/packs/organic.dm | 1 - code/modules/clothing/head/jobs.dm | 2 +- code/modules/mob/living/carbon/human/human_movement.dm | 2 -- modular_zubbers/code/datums/components/squeak.dm | 4 ++++ modular_zubbers/code/modules/cargo/packs/service.dm | 4 ++++ modular_zubbers/code/modules/clothing/head/jobs.dm | 3 +++ .../code/modules/mob/living/carbon/human/human.dm | 5 +++++ tgstation.dme | 1 + 11 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 modular_zubbers/code/datums/components/squeak.dm diff --git a/code/__DEFINES/dcs/signals/signals_object.dm b/code/__DEFINES/dcs/signals/signals_object.dm index 91f8d411d79ad..45b671141a380 100644 --- a/code/__DEFINES/dcs/signals/signals_object.dm +++ b/code/__DEFINES/dcs/signals/signals_object.dm @@ -266,7 +266,6 @@ ///from [/mob/living/carbon/human/Move]: () #define COMSIG_SHOES_STEP_ACTION "shoes_step_action" -#define COMSIG_NECK_STEP_ACTION "neck_step_action" //Bubbers addition // /obj/item/implant signals ///from base of /obj/item/implant/proc/activate(): () diff --git a/code/__DEFINES/~~bubber_defines/signals.dm b/code/__DEFINES/~~bubber_defines/signals.dm index 023ececaf4353..d0edef9aec6c8 100644 --- a/code/__DEFINES/~~bubber_defines/signals.dm +++ b/code/__DEFINES/~~bubber_defines/signals.dm @@ -2,3 +2,5 @@ #define COMSIG_MORGUE_ALARM "morgue_alarm" // Can be sent whenever an object's name is changed so components can be properly updated as well #define COMSIG_NAME_CHANGED "name_changed" +///from [/mob/living/carbon/human/Move]: () +#define COMSIG_NECK_STEP_ACTION "neck_step_action" diff --git a/code/datums/components/squeak.dm b/code/datums/components/squeak.dm index 038cd21ae4cb8..c5d42797ab433 100644 --- a/code/datums/components/squeak.dm +++ b/code/datums/components/squeak.dm @@ -43,8 +43,6 @@ RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) if(istype(parent, /obj/item/clothing/shoes)) RegisterSignal(parent, COMSIG_SHOES_STEP_ACTION, PROC_REF(step_squeak)) - if(istype(parent, /obj/item/clothing/neck)) - RegisterSignal(parent, COMSIG_NECK_STEP_ACTION, PROC_REF(step_squeak)) //Bubbers addition else if(isstructure(parent)) RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(use_squeak)) diff --git a/code/modules/cargo/packs/organic.dm b/code/modules/cargo/packs/organic.dm index 07f11417c64be..f405fc7de3a8a 100644 --- a/code/modules/cargo/packs/organic.dm +++ b/code/modules/cargo/packs/organic.dm @@ -74,7 +74,6 @@ /obj/item/seeds/rainbow_bunch, /obj/item/seeds/seedling, /obj/item/seeds/shrub, - /obj/item/seeds/vaporsac, //Bubbers Addition /obj/item/seeds/random = 2, ) crate_name = "exotic seeds crate" diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 607bfc031eca5..a5041de7fa0a9 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -621,7 +621,7 @@ name = "blue surgery cap" icon_state = "surgicalcap" desc = "A blue medical surgery cap to prevent the surgeon's hair from entering the insides of the patient!" - //flags_inv = HIDEHAIR //Cover your head doctor! (Bubber Edit: Disabled for preview QOL) //BUBBER TODO: Modularise + flags_inv = HIDEHAIR //Cover your head doctor! w_class = WEIGHT_CLASS_SMALL //surgery cap can be easily crumpled /obj/item/clothing/head/utility/surgerycap/attack_self(mob/user) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 9bd2e0e27a589..fda6d7a9142ea 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -29,8 +29,6 @@ if(shoes && body_position == STANDING_UP && has_gravity(loc)) if((. && !moving_diagonally) || (!. && moving_diagonally == SECOND_DIAG_STEP)) SEND_SIGNAL(shoes, COMSIG_SHOES_STEP_ACTION) - if(wear_neck && body_position == STANDING_UP && loc == NewLoc && has_gravity(loc)) - SEND_SIGNAL(wear_neck, COMSIG_NECK_STEP_ACTION) //Bubbers addition: Bell collars ring. (#1537) todo: modularize this /mob/living/carbon/human/Process_Spacemove(movement_dir = 0, continuous_move = FALSE) if(movement_type & FLYING || HAS_TRAIT(src, TRAIT_FREE_FLOAT_MOVEMENT)) diff --git a/modular_zubbers/code/datums/components/squeak.dm b/modular_zubbers/code/datums/components/squeak.dm new file mode 100644 index 0000000000000..d6f5a9f8748be --- /dev/null +++ b/modular_zubbers/code/datums/components/squeak.dm @@ -0,0 +1,4 @@ +/datum/component/squeak/Initialize(custom_sounds, volume_override, chance_override, step_delay_override, use_delay_override, extrarange, falloff_exponent, fallof_distance) + . = ..() + if(istype(parent, /obj/item/clothing/neck)) + RegisterSignal(parent, COMSIG_NECK_STEP_ACTION, PROC_REF(step_squeak)) diff --git a/modular_zubbers/code/modules/cargo/packs/service.dm b/modular_zubbers/code/modules/cargo/packs/service.dm index a5d9357719149..3b6c82a151d9a 100644 --- a/modular_zubbers/code/modules/cargo/packs/service.dm +++ b/modular_zubbers/code/modules/cargo/packs/service.dm @@ -5,3 +5,7 @@ contains = list(/obj/machinery/jukebox) crate_type = /obj/structure/closet/crate/large access_view = ACCESS_BAR + +/datum/supply_pack/organic/exoticseeds/New() + . = ..() + contains += /obj/item/seeds/vaporsac diff --git a/modular_zubbers/code/modules/clothing/head/jobs.dm b/modular_zubbers/code/modules/clothing/head/jobs.dm index b79ca871cef6a..6a896c13d5fdd 100644 --- a/modular_zubbers/code/modules/clothing/head/jobs.dm +++ b/modular_zubbers/code/modules/clothing/head/jobs.dm @@ -46,6 +46,9 @@ icon_state = "beanie_sec" armor_type = /datum/armor/beanie_sec +/obj/item/clothing/head/utility/surgerycap + flags_inv = null + /datum/armor/beanie_sec melee = 30 bullet = 25 diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/human.dm b/modular_zubbers/code/modules/mob/living/carbon/human/human.dm index ab43bb46993ec..d97e85bcfca96 100644 --- a/modular_zubbers/code/modules/mob/living/carbon/human/human.dm +++ b/modular_zubbers/code/modules/mob/living/carbon/human/human.dm @@ -5,3 +5,8 @@ // This is expected to be called or used in situations where you already know the mob is dead /mob/living/carbon/human/proc/get_dnr() return stat ? ((HAS_TRAIT(src, TRAIT_DNR) && !((src.mind?.get_ghost(FALSE, TRUE)) ? 1 : 0))) : 0 + +/mob/living/carbon/human/Move(NewLoc, direct) + . = ..() + if(wear_neck && body_position == STANDING_UP && loc == NewLoc && has_gravity(loc)) + SEND_SIGNAL(wear_neck, COMSIG_NECK_STEP_ACTION) diff --git a/tgstation.dme b/tgstation.dme index 7447372f05130..9918837e2833d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8565,6 +8565,7 @@ #include "modular_zubbers\code\datums\bubber_quirks\hydrophilic.dm" #include "modular_zubbers\code\datums\bubber_quirks\neutral.dm" #include "modular_zubbers\code\datums\bubber_quirks\petowner.dm" +#include "modular_zubbers\code\datums\components\squeak.dm" #include "modular_zubbers\code\datums\components\crafting\furniture.dm" #include "modular_zubbers\code\datums\components\crafting\tailoring.dm" #include "modular_zubbers\code\datums\components\crafting\utility.dm" From 00f669a4b167b9353086fb19ec1a88374b48fb31 Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Wed, 7 Aug 2024 09:08:05 +0200 Subject: [PATCH 2/8] Automatic changelog for PR #1914 [ci skip] --- html/changelogs/AutoChangeLog-pr-1914.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-1914.yml diff --git a/html/changelogs/AutoChangeLog-pr-1914.yml b/html/changelogs/AutoChangeLog-pr-1914.yml new file mode 100644 index 0000000000000..502577f0fed03 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1914.yml @@ -0,0 +1,4 @@ +author: "Odairu" +delete-after: True +changes: + - refactor: "modularizes a few things" \ No newline at end of file From 3ea90fff6611463cc0870adee0c2c8ba20874af4 Mon Sep 17 00:00:00 2001 From: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com> Date: Wed, 7 Aug 2024 02:52:20 -0700 Subject: [PATCH 3/8] Moonstation Even More Fixes + Feature (#1913) ## About The Pull Request For Moonstation: - Fixes a floating fire alarm near dorms. - Fixes the constant splooshing near the QM's office. - Adds a pirate cannon to the armory. It requires command access to open. - Fixes dim chaplain office. - Fixes directional chemistry shutters. - Fixes misplaced floor tile decals in virology. - Scraps the disposals system in virology in favor of a new one that dumps it to the z-level below. ## Why It's Good For The Game Fixes good. ## Proof Of Testing If it compiles, it works. ## Changelog :cl: BurgerBB fix: Fixes even more moonstation issues. /:cl: --------- Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com> --- _maps/map_files/moonstation/moonstation.dmm | 685 ++++++++++---------- 1 file changed, 355 insertions(+), 330 deletions(-) diff --git a/_maps/map_files/moonstation/moonstation.dmm b/_maps/map_files/moonstation/moonstation.dmm index 6db030fa86fd0..7c8038d095ce6 100644 --- a/_maps/map_files/moonstation/moonstation.dmm +++ b/_maps/map_files/moonstation/moonstation.dmm @@ -1190,15 +1190,20 @@ /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "are" = ( -/obj/effect/turf_decal/stripes/red/line{ - dir = 1 +/obj/machinery/door/window/brigdoor/right/directional/south{ + name = "Ye Ol' Faithful Storage"; + req_access = list("command"); + desc = "Yes, that's a functional cannon. Yes, it requires command access to open. No, you can't have it." }, -/obj/structure/rack, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/item/gun/energy/ionrifle, -/obj/machinery/light/no_nightlight/directional/north, -/obj/structure/sign/poster/official/random/directional/north, -/turf/open/floor/iron/dark, +/obj/structure/cannon{ + name = "Ye Ol' Faithful"; + desc = "The Head of Security's own personal cannon, appropriated after a lengthy battle with raiding pirates. Hasn't seen much use then, thankfully." + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/siding/wood/end{ + dir = 8 + }, +/turf/open/floor/wood/parquet, /area/station/ai_monitored/security/armory) "arh" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -2286,14 +2291,9 @@ /turf/closed/wall/rust, /area/station/maintenance/coffin_supply) "aFI" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/start/cargo_technician, -/turf/open/floor/iron, -/area/station/cargo/storage) +/obj/machinery/light_switch/directional/south, +/turf/open/floor/wood, +/area/station/service/bar) "aFJ" = ( /obj/effect/turf_decal/siding/dark{ dir = 10 @@ -4440,11 +4440,6 @@ /obj/structure/table, /obj/effect/turf_decal/tile/purple/half/contrasted, /obj/machinery/newscaster/directional/south, -/obj/item/restraints/legcuffs/beartrap, -/obj/item/restraints/legcuffs/beartrap{ - pixel_x = 2; - pixel_y = 5 - }, /obj/item/key/janitor, /turf/open/floor/iron/checker, /area/station/service/janitor) @@ -4737,6 +4732,9 @@ /area/lavaland/underground) "bnV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/security/office) "boa" = ( @@ -5004,12 +5002,14 @@ /turf/open/floor/engine, /area/station/science/xenobiology) "bsN" = ( +/obj/structure/disposaloutlet, +/obj/structure/sign/warning/directional/east, /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/structure/disposaloutlet, -/obj/structure/sign/warning/directional/east, -/turf/open/floor/catwalk_floor/iron_dark, +/obj/effect/turf_decal/stripes/asteroid/line, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/rust/moonstation, /area/station/medical/virology) "bsQ" = ( /turf/closed/wall, @@ -5286,7 +5286,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/cargo/blacksmith) "bxI" = ( /obj/effect/mapping_helpers/broken_floor, @@ -6446,11 +6446,9 @@ /turf/open/floor/iron/dark/small, /area/station/ai_monitored/turret_protected/ai) "bPU" = ( -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 8 - }, -/turf/closed/wall, -/area/station/medical/break_room) +/obj/structure/sign/warning/biohazard/directional/north, +/turf/open/misc/moonstation_rock, +/area/moonstation/underground) "bQf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, @@ -7058,9 +7056,6 @@ /obj/effect/turf_decal/tile/brown/fourcorners, /obj/machinery/door/firedoor, /obj/effect/landmark/navigate_destination/autoname, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 - }, /turf/open/floor/iron, /area/station/cargo/sorting) "bYP" = ( @@ -7455,7 +7450,6 @@ /turf/open/floor/plating, /area/station/engineering/asteroid_lobby) "ceT" = ( -/obj/machinery/light_switch/directional/north, /obj/structure/reagent_dispensers/beerkeg, /turf/open/floor/wood, /area/station/service/bar) @@ -8980,11 +8974,10 @@ /area/station/science/robotics/mechbay) "cCC" = ( /obj/structure/rack, -/obj/item/gun/energy/e_gun/dragnet, -/obj/item/gun/energy/e_gun/dragnet, /obj/effect/turf_decal/stripes/red/end{ dir = 1 }, +/obj/effect/spawner/random/armory/dragnet, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "cCE" = ( @@ -10252,7 +10245,6 @@ /obj/effect/spawner/random/armory/riot_armor, /obj/effect/spawner/random/armory/riot_helmet, /obj/effect/spawner/random/armory/riot_shield, -/obj/machinery/light/no_nightlight/directional/north, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "cVf" = ( @@ -10475,7 +10467,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, -/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/firealarm/directional/east, /turf/open/floor/wood/tile, /area/station/hallway/primary/starboard) "cYb" = ( @@ -10548,7 +10540,7 @@ }, /obj/effect/landmark/start/blacksmith, /obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/cargo/blacksmith) "cYR" = ( /obj/machinery/door/airlock/security/glass{ @@ -10745,6 +10737,9 @@ /area/station/engineering/atmos) "dcz" = ( /obj/machinery/photocopier, +/obj/effect/turf_decal/siding/dark{ + dir = 5 + }, /turf/open/floor/iron/dark, /area/station/security/office) "dcH" = ( @@ -11000,7 +10995,6 @@ location = "donkne"; name = "Donk Navigation Beacon" }, -/obj/effect/gibspawner/human, /turf/open/floor/carpet/donk, /area/station/maintenance/thruster_room) "dfG" = ( @@ -15602,7 +15596,6 @@ /area/station/security/prison/work) "eqY" = ( /obj/effect/turf_decal/delivery, -/obj/effect/landmark/start/cargo_technician, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, @@ -16825,6 +16818,9 @@ "eHt" = ( /obj/structure/table, /obj/machinery/fax/auto_name, +/obj/effect/turf_decal/siding/dark{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/station/security/office) "eHy" = ( @@ -17504,7 +17500,6 @@ /obj/effect/turf_decal/trimline/dark_green/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/virology) "eRX" = ( @@ -18898,6 +18893,12 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/department/engine) +"flv" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/office) "flB" = ( /obj/structure/sign/flag/syndicate/directional/east, /obj/effect/spawner/random/burgerstation/loot, @@ -19072,6 +19073,7 @@ dir = 1 }, /obj/item/kirbyplants/random, +/obj/item/radio/intercom/directional/north, /turf/open/floor/iron, /area/station/cargo/lobby) "fnX" = ( @@ -19239,6 +19241,7 @@ "fqy" = ( /obj/effect/turf_decal/vg_decals/numbers/three, /obj/effect/turf_decal/bot/left, +/obj/effect/landmark/start/cargo_technician, /turf/open/floor/iron, /area/station/cargo/storage) "fqz" = ( @@ -19882,6 +19885,9 @@ /obj/item/pen, /obj/item/toy/figure/secofficer, /obj/item/hand_labeler, +/obj/effect/turf_decal/siding/dark{ + dir = 10 + }, /turf/open/floor/iron/dark, /area/station/security/office) "fyn" = ( @@ -20310,6 +20316,7 @@ "fDh" = ( /obj/effect/turf_decal/vg_decals/numbers/four, /obj/effect/turf_decal/bot/left, +/obj/effect/landmark/start/cargo_technician, /turf/open/floor/iron, /area/station/cargo/storage) "fDq" = ( @@ -20487,14 +20494,15 @@ /turf/closed/wall, /area/station/service/chapel/storage) "fGz" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/landmark/start/cargo_technician, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 8 +/obj/structure/chair{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/cargo/storage) +/obj/effect/landmark/start/security_officer, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/office) "fGF" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -22806,6 +22814,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, +/obj/machinery/status_display/ai/directional/west, /turf/open/floor/wood/tile, /area/station/hallway/primary/aft) "gnL" = ( @@ -23455,6 +23464,7 @@ "gyj" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/vg_decals/numbers/eight, +/obj/effect/landmark/start/cargo_technician, /turf/open/floor/iron, /area/station/cargo/storage) "gyt" = ( @@ -23677,7 +23687,6 @@ /turf/open/floor/iron/dark, /area/station/service/library) "gCh" = ( -/obj/effect/gibspawner/human, /obj/machinery/light/small/red/directional/south, /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, @@ -28762,7 +28771,6 @@ }, /obj/machinery/door/firedoor, /obj/effect/landmark/navigate_destination/autoname, -/obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/virology) "hYt" = ( @@ -29018,9 +29026,9 @@ /turf/open/floor/plating, /area/station/tcommsat/computer) "ibA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/cargo/blacksmith) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/service/chapel/office) "ibC" = ( /obj/structure/table, /obj/item/paper/fluff/xenoarch_guide, @@ -29750,6 +29758,15 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit) +"inh" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/office) "inw" = ( /obj/item/skub{ name = "explosive (non-explosive) skub" @@ -30092,6 +30109,7 @@ "ith" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/vg_decals/numbers/five, +/obj/effect/landmark/start/cargo_technician, /turf/open/floor/iron, /area/station/cargo/storage) "itD" = ( @@ -30632,11 +30650,6 @@ /obj/structure/desk_bell, /obj/item/reagent_containers/spray/cleaner, /obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "pharm_desk_shutters"; - name = "Desk Shutters"; - dir = 8 - }, /turf/open/floor/iron/white, /area/station/medical/pharmacy) "iBA" = ( @@ -31106,7 +31119,7 @@ "iHA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/firealarm/directional/east, -/obj/machinery/light/small/dim/directional/east, +/obj/machinery/light/small/directional/east, /turf/open/floor/carpet/royalblack, /area/station/service/chapel/office) "iHC" = ( @@ -32876,6 +32889,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/food_or_drink/seed, /obj/machinery/firealarm/directional/south, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/grass, /area/station/service/hydroponics/garden) "jfE" = ( @@ -33380,7 +33394,7 @@ }, /obj/machinery/light/warm/directional/north, /obj/machinery/camera/autoname/directional/north, -/obj/machinery/digital_clock/directional/north, +/obj/item/radio/intercom/directional/north, /turf/open/floor/iron/dark/corner{ dir = 1 }, @@ -35903,13 +35917,9 @@ /turf/closed/wall, /area/station/medical/treatment_center) "jXZ" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/structure/closet/emcloset, -/obj/machinery/status_display/ai/directional/east, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/exit) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/medical/pharmacy) "jYj" = ( /obj/structure/sign/poster/random/directional/north, /obj/structure/table, @@ -36401,9 +36411,14 @@ /turf/open/floor/iron/large, /area/station/hallway/secondary/exit) "kfu" = ( -/obj/effect/gibspawner/human, -/turf/open/floor/carpet/donk, -/area/station/maintenance/thruster_room) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/office) "kfU" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 10 @@ -37092,10 +37107,11 @@ dir = 6 }, /obj/effect/turf_decal/tile/red, -/obj/item/kirbyplants/random, -/obj/structure/window/reinforced/spawner/directional/east, /obj/effect/decal/cleanable/cobweb, /obj/machinery/firealarm/directional/west, +/obj/structure/rack, +/obj/item/clothing/suit/hooded/ablative, +/obj/item/gun/energy/ionrifle, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "kpM" = ( @@ -37485,6 +37501,7 @@ /obj/effect/spawner/random/armory/bulletproof_armor, /obj/effect/spawner/random/armory/bulletproof_helmet, /obj/machinery/airalarm/directional/north, +/obj/machinery/light/no_nightlight/directional/north, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "kvh" = ( @@ -39591,11 +39608,9 @@ /area/station/service/hydroponics/garden) "kZo" = ( /obj/machinery/light/small/red/directional/west, -/obj/machinery/disposal/delivery_chute, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/catwalk_floor/iron_dark, +/obj/effect/turf_decal/stripes/asteroid/line, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/rust/moonstation, /area/station/medical/virology) "kZp" = ( /obj/machinery/door/airlock/command{ @@ -39675,7 +39690,7 @@ /obj/item/stack/sheet/bronze/thirty, /obj/item/stack/sheet/iron/twenty, /obj/item/stack/sheet/mineral/coal/ten, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/cargo/blacksmith) "lab" = ( /obj/effect/turf_decal/siding/wood{ @@ -39698,6 +39713,7 @@ pixel_y = 32; pixel_x = -32 }, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/wood/tile, /area/station/hallway/primary/central/aft) "lai" = ( @@ -40042,12 +40058,6 @@ /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"lfm" = ( -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, -/turf/closed/wall, -/area/station/medical/break_room) "lfp" = ( /obj/machinery/atmospherics/components/tank/nitrogen{ dir = 8 @@ -40104,7 +40114,9 @@ dir = 4 }, /obj/machinery/light/warm/directional/east, -/obj/item/radio/intercom/directional/east, +/obj/machinery/status_display/supply{ + pixel_x = 32 + }, /turf/open/floor/iron, /area/station/cargo/storage) "lgh" = ( @@ -40126,11 +40138,11 @@ /obj/item/food/grown/cherries, /obj/item/food/grown/soybeans, /obj/item/food/grown/citrus/lime, -/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 4 }, /obj/item/radio/intercom/directional/north, +/obj/machinery/status_display/ai/directional/east, /turf/open/floor/iron, /area/station/service/hydroponics/garden) "lgu" = ( @@ -41236,6 +41248,7 @@ "lvp" = ( /obj/effect/turf_decal/vg_decals/numbers/two, /obj/effect/turf_decal/bot/left, +/obj/effect/landmark/start/cargo_technician, /turf/open/floor/iron, /area/station/cargo/storage) "lvq" = ( @@ -41666,7 +41679,7 @@ /obj/machinery/newscaster/directional/west, /obj/machinery/oven/stone, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/cargo/blacksmith) "lBO" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -43030,7 +43043,6 @@ /area/station/hallway/primary/central/fore) "lVd" = ( /obj/effect/turf_decal/delivery, -/obj/effect/landmark/start/cargo_technician, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 }, @@ -46000,13 +46012,13 @@ /turf/open/floor/iron, /area/station/security/prison/visit) "mMG" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 4 +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "chem_shutters"; + name = "Privacy Shutters" }, -/obj/structure/closet/emcloset, -/obj/machinery/status_display/ai/directional/west, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/exit) +/turf/open/floor/plating, +/area/station/medical/chemistry) "mMM" = ( /turf/closed/wall/r_wall/rust, /area/station/ai_monitored/turret_protected/aisat/service) @@ -47175,9 +47187,6 @@ "ncI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /turf/open/floor/iron/white, /area/station/medical/virology) "ncJ" = ( @@ -48359,7 +48368,6 @@ /area/station/command/cc_dock) "nud" = ( /obj/effect/turf_decal/tile/dark_green/half/contrasted, -/obj/structure/disposalpipe/segment, /obj/item/kirbyplants/random, /turf/open/floor/iron/white, /area/station/medical/virology) @@ -49439,7 +49447,7 @@ dir = 4 }, /obj/structure/reagent_anvil, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/cargo/blacksmith) "nKY" = ( /obj/machinery/door/airlock{ @@ -53186,7 +53194,6 @@ /area/station/security/checkpoint/engineering) "oMr" = ( /obj/effect/turf_decal/trimline/dark_green/filled/line, -/obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "oMs" = ( @@ -53748,6 +53755,9 @@ /obj/structure/table, /obj/item/radio/intercom, /obj/item/megaphone/sec, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/security/office) "oUu" = ( @@ -54725,7 +54735,6 @@ /area/station/service/hydroponics/garden) "piw" = ( /obj/effect/turf_decal/delivery, -/obj/effect/landmark/start/cargo_technician, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, @@ -54962,6 +54971,7 @@ /area/station/maintenance/department/engine) "plD" = ( /obj/machinery/holopad, +/obj/effect/turf_decal/tile/red, /turf/open/floor/iron/dark, /area/station/security/office) "plH" = ( @@ -55247,7 +55257,7 @@ /obj/machinery/light/warm/directional/east, /obj/structure/reagent_water_basin, /obj/effect/turf_decal/tile/brown/anticorner/contrasted, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/cargo/blacksmith) "pqf" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted, @@ -55268,7 +55278,7 @@ }, /obj/item/radio/intercom/directional/east, /obj/structure/reagent_forge, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/cargo/blacksmith) "pqp" = ( /obj/machinery/door/airlock/grunge{ @@ -56422,7 +56432,6 @@ /area/station/commons/toilet/locker) "pGu" = ( /obj/effect/turf_decal/delivery, -/obj/effect/landmark/start/cargo_technician, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 }, @@ -56860,6 +56869,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/holiday/rainbow/fourcorners, +/obj/item/radio/intercom/directional/south, /turf/open/floor/iron/checker, /area/station/hallway/secondary/exit/departure_lounge) "pMM" = ( @@ -57098,6 +57108,9 @@ dir = 8 }, /obj/machinery/light/small/red/directional/north, +/obj/machinery/status_display/supply{ + pixel_y = 32 + }, /turf/open/floor/iron, /area/station/cargo/warehouse) "pQk" = ( @@ -57141,7 +57154,7 @@ /area/station/engineering/main) "pQu" = ( /obj/effect/turf_decal/tile/brown, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/cargo/blacksmith) "pQv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -57467,7 +57480,7 @@ "pVt" = ( /obj/effect/turf_decal/tile/brown/half/contrasted, /obj/structure/throwing_wheel, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/cargo/blacksmith) "pVw" = ( /obj/machinery/keycard_auth/wall_mounted/directional/south, @@ -57754,7 +57767,7 @@ /obj/item/storage/crayons, /obj/item/storage/fancy/candle_box, /obj/machinery/newscaster/directional/west, -/obj/machinery/light/small/dim/directional/west, +/obj/machinery/light/small/directional/west, /turf/open/floor/carpet/royalblack, /area/station/service/chapel/office) "pZC" = ( @@ -58823,7 +58836,7 @@ dir = 1 }, /obj/machinery/airalarm/directional/west, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/cargo/blacksmith) "qoo" = ( /obj/effect/turf_decal/trimline/white/line{ @@ -59216,7 +59229,7 @@ "qvc" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; + dir = 8; id = "chem_shutters"; name = "Privacy Shutters" }, @@ -59332,6 +59345,7 @@ /obj/machinery/camera/autoname/directional/west{ dir = 10 }, +/obj/machinery/status_display/ai/directional/west, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit) "qwl" = ( @@ -61273,7 +61287,6 @@ /obj/effect/turf_decal/tile/dark_green/diagonal_centre, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/virology) "qYE" = ( @@ -62670,14 +62683,19 @@ "rrJ" = ( /obj/structure/table/wood, /obj/item/reagent_containers/cup/glass/bottle/holywater{ - pixel_y = 15 + pixel_y = 4 }, /obj/item/nullrod{ pixel_x = 9; pixel_y = 3 }, -/obj/item/soulstone/anybody/chaplain, -/obj/item/toy/eightball/haunted, +/obj/item/soulstone/anybody/chaplain{ + pixel_x = -10 + }, +/obj/item/toy/eightball/haunted{ + pixel_x = -17; + pixel_y = 5 + }, /obj/item/radio/intercom/directional/east, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, @@ -64553,8 +64571,7 @@ /turf/open/floor/plating, /area/station/maintenance/port) "rTF" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, +/turf/open/floor/glass/reinforced/scrape_below, /area/station/commons/storage/primary) "rTI" = ( /obj/effect/spawner/random/burgerstation/odd, @@ -64843,6 +64860,9 @@ dir = 8 }, /obj/effect/landmark/start/head_of_security, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/security/office) "rYF" = ( @@ -64906,7 +64926,6 @@ pixel_y = 8; req_access = list("virology") }, -/obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/virology) "rZm" = ( @@ -64974,7 +64993,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/landmark/start/cargo_technician, /turf/open/floor/iron, /area/station/cargo/storage) "saq" = ( @@ -65745,9 +65763,6 @@ "skM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Medbay Emergency Entrance" @@ -65756,6 +65771,9 @@ dir = 8 }, /obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "skN" = ( @@ -66447,16 +66465,23 @@ /turf/open/floor/plating, /area/station/engineering/supermatter/emitter) "suI" = ( -/obj/effect/turf_decal/stripes/red/line{ - dir = 10 +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/fermenting_barrel/gunpowder, +/obj/item/stack/cannonball/four{ + pixel_y = 8 }, -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/tile/red{ - dir = 8 +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/reagent_containers/cup/bucket/wooden{ + pixel_y = -4; + pixel_x = -10 }, -/obj/structure/sign/poster/official/random/directional/north, -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/floor/iron/dark, +/obj/item/clothing/head/costume/pirate{ + pixel_y = -8 + }, +/obj/effect/turf_decal/siding/wood/end{ + dir = 4 + }, +/turf/open/floor/wood/parquet, /area/station/ai_monitored/security/armory) "suK" = ( /obj/item/stack/rail_track/fifty{ @@ -66875,12 +66900,11 @@ /turf/open/floor/iron/checker, /area/station/engineering/atmos/control_center) "sBv" = ( -/obj/machinery/conveyor{ - dir = 10; - id = "garbage_viro" +/obj/item/paper/crumpled/bloody{ + default_raw_text = "Pool's closed." }, -/turf/open/floor/iron/pool, -/area/station/medical/virology) +/turf/open/misc/moonstation_rock, +/area/moonstation/underground) "sBx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -67201,7 +67225,6 @@ /obj/effect/turf_decal/trimline/dark_green/filled/line{ dir = 1 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/virology) "sGb" = ( @@ -67293,6 +67316,7 @@ "sHr" = ( /obj/effect/turf_decal/vg_decals/numbers/one, /obj/effect/turf_decal/bot/left, +/obj/effect/landmark/start/cargo_technician, /turf/open/floor/iron, /area/station/cargo/storage) "sHu" = ( @@ -68103,7 +68127,6 @@ /turf/open/floor/bamboo, /area/station/maintenance/abandon_wrestle) "sTd" = ( -/obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{ dir = 4 }, @@ -70455,6 +70478,12 @@ /obj/item/stack/cable_coil, /turf/open/floor/plating/rust/moonstation, /area/moonstation/surface) +"tCi" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/office) "tCj" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/computer/pod/old/mass_driver_controller/trash{ @@ -70861,7 +70890,7 @@ /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/cargo/blacksmith) "tGv" = ( /obj/structure/chair/comfy/black{ @@ -73687,7 +73716,7 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/cargo/blacksmith) "uwr" = ( /obj/effect/turf_decal/bot, @@ -74506,10 +74535,6 @@ /obj/item/storage/photo_album/chapel, /obj/item/camera/spooky, /obj/effect/turf_decal/siding/wood, -/obj/item/toy/eightball/broken{ - pixel_y = 2; - pixel_x = 16 - }, /turf/open/floor/wood, /area/station/service/chapel/office) "uHn" = ( @@ -75292,7 +75317,7 @@ /obj/structure/table/wood, /obj/machinery/pollution_scrubber, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/cargo/blacksmith) "uTK" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ @@ -76773,6 +76798,7 @@ "vpt" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/vg_decals/numbers/seven, +/obj/effect/landmark/start/cargo_technician, /turf/open/floor/iron, /area/station/cargo/storage) "vpw" = ( @@ -76859,7 +76885,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/cargo/blacksmith) "vqo" = ( /obj/effect/turf_decal/stripes/line, @@ -77914,9 +77940,13 @@ /turf/open/floor/plating/rust/moonstation, /area/moonstation/underground) "vFY" = ( -/obj/item/radio/intercom/directional/east, -/turf/open/floor/glass/reinforced/scrape_below, -/area/station/common/wrestling/arena) +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/item/kirbyplants/random, +/obj/machinery/status_display/ai/directional/east, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/exit) "vGa" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/vg_decals/numbers/one, @@ -78056,7 +78086,7 @@ /area/station/command/heads_quarters/hop) "vJk" = ( /obj/machinery/holopad, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/cargo/blacksmith) "vJG" = ( /obj/effect/turf_decal/siding/purple{ @@ -78425,9 +78455,9 @@ /turf/open/floor/plating, /area/station/maintenance/night_club) "vPU" = ( -/obj/item/radio/intercom/prison/directional/west, /obj/machinery/camera/autoname/security/directional/west, /obj/structure/sink/directional/east, +/obj/item/radio/intercom/prison/directional/west, /turf/open/floor/wood, /area/station/service/bar) "vPV" = ( @@ -78500,14 +78530,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/space_hut) -"vRc" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron/white, -/area/station/medical/virology) "vRd" = ( /turf/open/floor/engine, /area/station/engineering/atmos/project) @@ -79616,10 +79638,11 @@ dir = 1 }, /obj/structure/rack, -/obj/item/clothing/suit/hooded/ablative, /obj/effect/turf_decal/tile/red/half/contrasted, /obj/item/gun/energy/temperature/security, /obj/item/radio/intercom/directional/north, +/obj/machinery/light/no_nightlight/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "wgG" = ( @@ -79906,11 +79929,7 @@ /turf/open/floor/iron/dark, /area/station/security/prison/safe) "wkp" = ( -/obj/machinery/conveyor{ - dir = 9; - id = "garbage_viro" - }, -/turf/open/floor/iron/pool, +/turf/open/openspace/moonstation, /area/station/medical/virology) "wku" = ( /obj/effect/decal/cleanable/cobweb, @@ -80657,6 +80676,9 @@ pixel_y = -3 }, /obj/machinery/syndicatebomb/training, +/obj/effect/turf_decal/siding/dark{ + dir = 6 + }, /turf/open/floor/iron/dark, /area/station/security/office) "wwT" = ( @@ -81421,7 +81443,7 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted, /obj/structure/reagent_crafting_bench, /obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/cargo/blacksmith) "wHJ" = ( /obj/structure/cable, @@ -81637,7 +81659,6 @@ /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) "wKR" = ( -/obj/structure/closet/secure_closet/animal, /obj/machinery/firealarm/directional/south, /obj/item/knife/bowie{ force = 12; @@ -81646,6 +81667,17 @@ }, /obj/effect/turf_decal/tile/purple/half/contrasted, /obj/machinery/light/warm/directional/south, +/obj/structure/closet{ + name = "animal control closet" + }, +/obj/item/restraints/legcuffs/beartrap, +/obj/item/restraints/legcuffs/beartrap{ + pixel_x = 2; + pixel_y = 5 + }, +/obj/item/restraints/legcuffs/beartrap{ + pixel_y = 10 + }, /turf/open/floor/iron/checker, /area/station/service/janitor) "wKY" = ( @@ -82269,7 +82301,6 @@ /obj/effect/turf_decal/trimline/dark_green/filled/line{ dir = 1 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/virology) "wTv" = ( @@ -82418,6 +82449,7 @@ "wWg" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/vg_decals/numbers/six, +/obj/effect/landmark/start/cargo_technician, /turf/open/floor/iron, /area/station/cargo/storage) "wWr" = ( @@ -82787,6 +82819,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/security/office) "xbF" = ( @@ -83130,15 +83165,9 @@ /turf/open/floor/plating/rust, /area/station/maintenance/space_hut/cabin) "xhk" = ( -/obj/effect/turf_decal/tile/dark_green/diagonal_centre, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) +/obj/effect/spawner/liquids_spawner/puddle, +/turf/open/floor/iron/pool, +/area/moonstation/underground) "xhn" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron, @@ -85241,7 +85270,6 @@ /obj/structure/chair/office{ dir = 3 }, -/obj/effect/landmark/start/cargo_technician, /turf/open/floor/carpet, /area/station/cargo/office) "xLD" = ( @@ -86871,7 +86899,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/cargo/blacksmith) "ygV" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -87192,9 +87220,6 @@ /obj/effect/spawner/random/medical/medkit, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"ylo" = ( -/turf/closed/wall/r_wall, -/area/moonstation/underground/unexplored) "ylq" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -185638,7 +185663,7 @@ jnN jnN jnN jnN -ylo +jnN jnN jnN jnN @@ -188408,7 +188433,7 @@ sSg sSg sSg jnN -jnN +sSg jnN jnN jnN @@ -188665,7 +188690,7 @@ jnN jnN jnN jnN -jnN +sSg jnN jnN jnN @@ -188922,7 +188947,7 @@ jnN jnN jnN jnN -jnN +sSg jnN jnN jnN @@ -189178,8 +189203,8 @@ jnN jnN jnN jnN -jnN -jnN +sSg +sSg jnN jnN jnN @@ -189435,8 +189460,8 @@ jnN jnN jnN jnN -jnN -jnN +sSg +sSg jnN jnN jnN @@ -189692,8 +189717,8 @@ jnN jnN jnN jnN -jnN -jnN +sSg +sSg jnN jnN jnN @@ -189949,8 +189974,8 @@ jnN jnN jnN jnN -jnN -jnN +sSg +sSg jnN jnN jnN @@ -190206,8 +190231,8 @@ jnN jnN jnN jnN -jnN -jnN +sSg +sSg jnN jnN jnN @@ -190463,9 +190488,9 @@ jnN jnN jnN jnN -jnN -jnN -jnN +sSg +sSg +sSg jnN jnN jnN @@ -190719,10 +190744,10 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN +jnN +sSg +sSg +sSg jnN jnN jnN @@ -190978,8 +191003,8 @@ jnN jnN jnN jnN -jnN -jnN +sSg +sSg jnN jnN jnN @@ -191230,13 +191255,13 @@ jnN jnN jnN jnN +kJH jnN jnN jnN jnN -jnN -jnN -jnN +sSg +sSg jnN jnN jnN @@ -191486,14 +191511,14 @@ jnN jnN jnN jnN +kJH +kJH +kJH jnN jnN jnN -jnN -jnN -jnN -jnN -jnN +sSg +sSg jnN jnN jnN @@ -191742,15 +191767,15 @@ jnN jnN jnN jnN +kJH +kJH +kJH +kJH +kJH jnN jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +sSg +sSg jnN jnN jnN @@ -191998,16 +192023,16 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +tFE +tFE +bPU jnN jnN jnN @@ -192255,19 +192280,19 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +tFE +xhk +sSg +sSg +sSg +sSg jnN jnN jnN @@ -192513,25 +192538,25 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +tFE +xhk +sBv +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg jnN jnN jnN @@ -192771,24 +192796,24 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +tFE +tFE +bPU +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg sSg jnN jnN @@ -193029,9 +193054,9 @@ jnN jnN jnN jnN -jnN -jnN -jnN +kJH +kJH +kJH jnN jnN jnN @@ -193286,8 +193311,8 @@ jnN jnN jnN jnN -jnN -jnN +kJH +kJH jnN jnN jnN @@ -193543,7 +193568,7 @@ jnN jnN jnN jnN -jnN +kJH jnN jnN jnN @@ -239292,7 +239317,7 @@ pWW bjf san xfa -fGz +san mwo lVd mwo @@ -240318,7 +240343,7 @@ wLw cLx bjf bjf -aFI +piw dVX piw dVX @@ -242134,7 +242159,7 @@ xqw hDk aBy fqI -kfu +hIV noz gCh itb @@ -242392,7 +242417,7 @@ tzp aBy hIV cMm -kfu +hIV jax iIy lmb @@ -242650,7 +242675,7 @@ aBy dfE hIV tmw -kfu +hIV itb bEN siN @@ -243369,7 +243394,7 @@ dWm mWk mWk vHA -vFY +mWk mWk vHA sDw @@ -244446,7 +244471,7 @@ oea daJ nSx tGu -ibA +jSu vJk ygL pVt @@ -248247,7 +248272,7 @@ fCW rLP xWa qgu -pjJ +aFI uiV iBj qKn @@ -257014,7 +257039,7 @@ jFm wJL neH dHp -xhk +qXq oMr hXZ wTt @@ -257022,8 +257047,8 @@ qYy eRW rZa sFW -kzW -kzW +ncI +ncI ncI tdM xAV @@ -257281,7 +257306,7 @@ sBP pEE gcQ tvG -qMj +ncI oEP xAV kuV @@ -257516,7 +257541,7 @@ ozu hxQ vaM dwR -bhV +jXZ bpZ jFm iRW @@ -257538,7 +257563,7 @@ sBa cRI hmK fBc -qMj +ncI jOP xAV xAV @@ -257791,13 +257816,13 @@ sBa qyK tkF idT -bPU +sBa jZa fTe tcJ -vRc +ncI nud -rYm +cgU kZo wkp eOD @@ -258030,7 +258055,7 @@ arh fxD fVk rlX -xxW +mMG fgf sNI oFu @@ -258048,7 +258073,7 @@ cDk jqE vRo jyJ -lfm +sBa aTm bMF fuH @@ -258056,7 +258081,7 @@ kzW pKW rYm bsN -sBv +wkp eOD hFK sSh @@ -258287,7 +258312,7 @@ pjo fGf awh jnl -xxW +mMG gYn jil gkV @@ -259279,10 +259304,10 @@ gAT kCz mlV plD -jlZ -jlZ -jlZ -gmD +fGz +fGz +fGz +inh xyX kTH sOS @@ -259535,11 +259560,11 @@ vFc pii kCz vKs -uZU +iKe hxd hxd hxd -gmD +kfu fMo oVV lcj @@ -259792,11 +259817,11 @@ bAt fpQ ggp hzW -uZU +iKe eHt oUn fyl -gmD +kfu ipk xtg pzd @@ -260049,11 +260074,11 @@ vFc uwr ggp aUq -uZU +iKe dcz rYD wwy -gmD +kfu oEg kTH tEv @@ -260306,11 +260331,11 @@ bAt jrM ggp qGZ -uZU +iKe hxd hxd hxd -gmD +kfu soL kTH fdR @@ -260563,11 +260588,11 @@ vFc sRV ggp dqK -uZU +iKe hxd hxd hxd -gmD +kfu xqE kTH okD @@ -260820,11 +260845,11 @@ twn tbU ggp pNw -uZU +iKe hxd hxd hxd -gmD +kfu moh iYh iYh @@ -261077,9 +261102,9 @@ uxt ggp ggp igs -uZU +tCi xbm -uZU +flv bnV gmD iKe @@ -263143,7 +263168,7 @@ stM stM stM stM -udC +ibA uHk dmv pZw @@ -263400,7 +263425,7 @@ stM stM stM stM -udC +ibA rrJ rbJ ekH @@ -265736,8 +265761,8 @@ pdp bFM ucI nCF -jXZ -eYo +ggm +vFY imP eYo nuS @@ -268820,7 +268845,7 @@ aQD bFM xCo rXc -mMG +sRJ qwi pKw pYu @@ -277080,7 +277105,7 @@ stM stM stM stM -sSp +stM stM stM sSp @@ -277090,7 +277115,7 @@ stM wYP stM stM -wYP +stM stM stM stM From 6886106860864623a2db5595d9ea574f30c6cbb9 Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Wed, 7 Aug 2024 11:52:48 +0200 Subject: [PATCH 4/8] Automatic changelog for PR #1913 [ci skip] --- html/changelogs/AutoChangeLog-pr-1913.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-1913.yml diff --git a/html/changelogs/AutoChangeLog-pr-1913.yml b/html/changelogs/AutoChangeLog-pr-1913.yml new file mode 100644 index 0000000000000..3d66f8047ebbe --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1913.yml @@ -0,0 +1,4 @@ +author: "BurgerBB" +delete-after: True +changes: + - bugfix: "Fixes even more moonstation issues." \ No newline at end of file From 8254bbbe1e4ab2329da2a3c031cbd1c70bae1f1f Mon Sep 17 00:00:00 2001 From: Odairu <39929315+Odairu@users.noreply.github.com> Date: Thu, 8 Aug 2024 07:13:39 -0400 Subject: [PATCH 5/8] [non-modular] Adds a new trait for the basic security hud and cleans up the secmed glasses in tandum with that (#1920) ## About The Pull Request does as title says ## Why It's Good For The Game players won't notice but code looks better ## Proof Of Testing ![image](https://github.com/user-attachments/assets/aa2edc6d-7ea8-41c1-b03d-1e614b678a33) ## Changelog :cl: code: changed basic sec hud into a trait /:cl: --- code/__DEFINES/~~bubber_defines/traits.dm | 3 +++ code/datums/hud.dm | 1 + .../modules/security/secmed/security_medic.dm | 17 +---------------- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/code/__DEFINES/~~bubber_defines/traits.dm b/code/__DEFINES/~~bubber_defines/traits.dm index b291679dfad9f..6d61715d22026 100644 --- a/code/__DEFINES/~~bubber_defines/traits.dm +++ b/code/__DEFINES/~~bubber_defines/traits.dm @@ -13,3 +13,6 @@ //For the hemophage quirk that allows hemophages to eat/drink normal food/drink. #define TRAIT_MASQUERADE_FOOD "masquerade_food" + +//basic security hud +#define TRAIT_BASIC_SECURITY_HUD "basic_security_hud" diff --git a/code/datums/hud.dm b/code/datums/hud.dm index 4537a4ada7e05..ca0a9d43520f3 100644 --- a/code/datums/hud.dm +++ b/code/datums/hud.dm @@ -28,6 +28,7 @@ GLOBAL_LIST_INIT(trait_to_hud, list( TRAIT_DIAGNOSTIC_HUD = DATA_HUD_DIAGNOSTIC, TRAIT_BOT_PATH_HUD = DATA_HUD_BOT_PATH, // SKYRAT EDIT CHANGE TRAIT_PERMIT_HUD = DATA_HUD_PERMIT, // SKYRAT EDIT ADDITION + TRAIT_BASIC_SECURITY_HUD = DATA_HUD_SECURITY_BASIC // BUBBER EDIT ADDITION )) /datum/atom_hud diff --git a/modular_zubbers/code/modules/security/secmed/security_medic.dm b/modular_zubbers/code/modules/security/secmed/security_medic.dm index b4c1c728dd1db..78e8a197e4545 100644 --- a/modular_zubbers/code/modules/security/secmed/security_medic.dm +++ b/modular_zubbers/code/modules/security/secmed/security_medic.dm @@ -100,22 +100,7 @@ icon = 'modular_zubbers/code/modules/security/secmed/icons/secmed_equipment.dmi' icon_state = "hud" worn_icon_state = "healthhud" - clothing_traits = list(TRAIT_MEDICAL_HUD) - -/obj/item/clothing/glasses/hud/secmed/equipped(mob/living/carbon/human/user, slot) - . = ..() - if(!(slot & ITEM_SLOT_EYES)) - return - // Extra hud because the bloody code doesn't support multihuds yet. I'll probably add multihud support soon enough. If you see this I didn't. ~Waterpig - var/datum/atom_hud/extra_hud = GLOB.huds[DATA_HUD_SECURITY_BASIC] - extra_hud.show_to(user) - -/obj/item/clothing/glasses/hud/secmed/dropped(mob/living/carbon/human/user) - . = ..() - if(!istype(user) || user.glasses != src) - return - var/datum/atom_hud/extra_hud = GLOB.huds[DATA_HUD_SECURITY_BASIC] - extra_hud.hide_from(user) + clothing_traits = list(TRAIT_MEDICAL_HUD, TRAIT_BASIC_SECURITY_HUD) /obj/item/clothing/glasses/hud/secmed/sunglasses name = "security-medical HUD sunglasses" From 07d22c88439f400130106d236a8f913136db58a0 Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Thu, 8 Aug 2024 13:14:05 +0200 Subject: [PATCH 6/8] Automatic changelog for PR #1920 [ci skip] --- html/changelogs/AutoChangeLog-pr-1920.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-1920.yml diff --git a/html/changelogs/AutoChangeLog-pr-1920.yml b/html/changelogs/AutoChangeLog-pr-1920.yml new file mode 100644 index 0000000000000..3ce5b5f7e5cb0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1920.yml @@ -0,0 +1,4 @@ +author: "Odairu" +delete-after: True +changes: + - code_imp: "changed basic sec hud into a trait" \ No newline at end of file From 433fbd6957b550998884e6414bb9c7819cf4f385 Mon Sep 17 00:00:00 2001 From: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com> Date: Thu, 8 Aug 2024 11:02:12 -0600 Subject: [PATCH 7/8] Emags unlink borgs from the console + 0.5 delay in opening their covers (#1871) Reopens this because my branch messed up with the master screw up. ## About The Pull Request - Introduces a (needs testing) half a second delay in crowbaring a borg's cover. - A visible balloon alert to the borg will show if the cover is being opened. - Emags scramble codes. This unlinks them from the robotics console. ## Why It's Good For The Game 1. Stealth emagging is extremely difficult for people to pull off due to the counters specified in #1844. EMPs are not stealthy. Flashing and chasing a borg around is not stealthy. If a borg has its cover open, you can instantly emag it. 2. This adds the delay back, but it's half a second with a balloon text to opening the cover entirely. It should allow borgs a little more breathing room in general. Not just emags. 3. Emagging a borg will scramble its codes so it's not immedietly locked down and stuck for five minutes (or until deconstruction) getting dragged around by its emagger. This will give them more of a fighting chance. ## Proof Of Testing ![image](https://github.com/user-attachments/assets/72fea26b-73ae-45a4-8d18-dc93fc536899) ## Changelog :cl: balance: Emagging a borg will now scramble its codes plus opening the cover has a delay /:cl: --------- Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com> --- code/modules/mob/living/silicon/robot/robot_defense.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm index 549762fd7a943..34962b6fd16cc 100644 --- a/code/modules/mob/living/silicon/robot/robot_defense.dm +++ b/code/modules/mob/living/silicon/robot/robot_defense.dm @@ -262,7 +262,11 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real if(locked) to_chat(user, span_warning("The cover is locked and cannot be opened!")) else - to_chat(user, span_notice("You open the cover.")) + // BUBBER EDIT START + balloon_alert_to_viewers("Cover Opening...", "Opening Cover...", 1) + if(!do_after(user, 0.5 SECONDS)) + return FALSE + // BUBBER EDIT START opened = TRUE update_icons() @@ -356,6 +360,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real ResetModel() return TRUE + scrambledcodes = TRUE // BUBBER EDIT START SetEmagged(1) SetStun(60) //Borgs were getting into trouble because they would attack the emagger before the new laws were shown lawupdate = FALSE From 67801aabc63ab88338a6487b9dae2ae7d294cdef Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Thu, 8 Aug 2024 19:05:39 +0200 Subject: [PATCH 8/8] Automatic changelog for PR #1871 [ci skip] --- html/changelogs/AutoChangeLog-pr-1871.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-1871.yml diff --git a/html/changelogs/AutoChangeLog-pr-1871.yml b/html/changelogs/AutoChangeLog-pr-1871.yml new file mode 100644 index 0000000000000..d29b2e9b359bb --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1871.yml @@ -0,0 +1,4 @@ +author: "StrangeWeirdKitten" +delete-after: True +changes: + - balance: "Emagging a borg will now scramble its codes plus opening the cover has a delay" \ No newline at end of file