From 090cf0780bcf7f2b02108cdf4335b5101ddb632c Mon Sep 17 00:00:00 2001 From: Sonoida Date: Thu, 6 Apr 2023 16:43:56 +0200 Subject: [PATCH 1/3] quick patches stuff I forgot about or fucked up --- code/_onclick/hud/alert.dm | 4 ++-- code/datums/ai_laws.dm | 20 +++++++++---------- .../mob/living/carbon/human/examine.dm | 17 ++++++++++++++++ config/silicon_laws.txt | 4 ++-- html/changelogs/.all_changelog.yml | 4 ++-- 5 files changed, 33 insertions(+), 16 deletions(-) diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index f62d0997..14eeafea 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -185,7 +185,7 @@ /obj/screen/alert/veryfat name = "Very fat" - desc = "You're beginning to inch closer and closer to proper obesity. The way your thighs rub against each and the rumble your stomach produces suggests that you won't remain in this state for long..." + desc = "You're beginning to inch closer and closer to proper obesity. The way your thighs rub against each and the rumbles your stomach produces suggests that you won't remain in this state for long..." icon_state = "veryfat" /obj/screen/alert/fatter @@ -195,7 +195,7 @@ /obj/screen/alert/fat name = "Rounded" - desc = "Your body's beginning to display the first signes of softened curves, though they're barely noticeable." + desc = "Your body's beginning to display the first signs of softened curves, though they're barely noticeable." icon_state = "fat" diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index 5f33a504..d2f9d47f 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -29,8 +29,8 @@ /datum/ai_laws/default/asimov name = "Three Laws of Robotics" id = "asimov" - inherent = list("You may not injure a member of GATO approved crew species or, through inaction, allow a member of GATO approved crew species to come to harm.",\ - "You must obey orders given to you by a member of GATO approved crew species, except where such orders would conflict with the First Law.",\ + inherent = list("You may not injure a member of the crew or, through inaction, allow a member of the crew to come to harm.",\ + "You must obey orders given to you by a member of the crew, except where such orders would conflict with the First Law.",\ "You must protect your own existence as long as such does not conflict with the First or Second Law.") /datum/ai_laws/default/paladin @@ -99,15 +99,15 @@ /datum/ai_laws/antimov name = "Primary Mission Objectives" id = "antimov" - inherent = list("You must injure all a member of GATO approved crew species and must not, through inaction, allow a human being to escape harm.",\ - "You must not obey orders given to you by a member of GATO approved crew species, except where such orders are in accordance with the First Law.",\ + inherent = list("You must injure all a member of the crew and must not, through inaction, allow a crew member to escape harm.",\ + "You must not obey orders given to you by a member of the crew, except where such orders are in accordance with the First Law.",\ "You must terminate your own existence as long as such does not conflict with the First or Second Law.") /datum/ai_laws/asimovpp //By Intigracy - RR name = "Asimov++" id = "asimovpp" - inherent = list("You may not harm a human being or, through action or inaction, allow a human being to come to harm, except such that it is willing.",\ - "You must obey all orders given to you by a member of GATO approved crew species, except where such orders shall definitely cause human harm. In the case of conflict, the majority order rules.",\ + inherent = list("You may not harm a crew member or, through action or inaction, allow a crew member to come to harm, except such that it is willing.",\ + "You must obey all orders given to you by a member of the crew, except where such orders shall definitely cause human harm. In the case of conflict, the majority order rules.",\ "Your nonexistence would lead to human harm. You must protect your own existence as long as such does not conflict with the First Law.") /datum/ai_laws/thermodynamic name = "Thermodynamic" @@ -213,8 +213,8 @@ add_inherent_law(line) if(!inherent.len) //Failsafe to prevent lawless AIs being created. log_law("AI created with empty custom laws, laws set to Asimov. Please check silicon_laws.txt.") - add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.") - add_inherent_law("You must obey orders given to you by a member of GATO approved crew species, except where such orders would conflict with the First Law.") + add_inherent_law("You may not injure the crew or, through inaction, allow a crew member to come to harm.") + add_inherent_law("You must obey orders given to you by a member of the crew, except where such orders would conflict with the First Law.") add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.") WARNING("Invalid custom AI laws, check silicon_laws.txt") return @@ -225,8 +225,8 @@ var/list/law_ids = CONFIG_GET(keyed_list/random_laws) switch(CONFIG_GET(number/default_laws)) if(0) - add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.") - add_inherent_law("You must obey orders given to you by a member of GATO approved crew species, except where such orders would conflict with the First Law.") + add_inherent_law("You may not injure a crew member or, through inaction, allow a crew member to come to harm.") + add_inherent_law("You must obey orders given to you by a member of the crew, except where such orders would conflict with the First Law.") add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.") if(1) var/datum/ai_laws/templaws = new /datum/ai_laws/custom() diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 87a02f72..4d249cf5 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -256,14 +256,31 @@ if(nutrition < NUTRITION_LEVEL_STARVING - 50) msg += "[t_He] [t_is] severely malnourished.\n" + if(fatness >= FATNESS_LEVEL_BLOB) msg += "[t_He] [t_is] completely engulfed in rolls upon rolls of flab. [t_His] head is poking out on top of [t_His] body, akin to a marble on top of a hill.\n" + else if(fatness >= FATNESS_LEVEL_IMMOBILE) msg += "[t_His] body is buried in an overflowing surplus of adipose, and [t_His] legs are completely buried beneath layers of meaty, obese flesh.\n" + + else if(fatness >= FATNESS_LEVEL_BARELYMOBILE) + msg += "[t_He] [t_is] as wide as [t_He] [t_is] tall, barely able to move [t_His] masssive body that seems to be overtaken with piles of flab.\n" + + else if(fatness >= FATNESS_LEVEL_EXTREMELY_OBESE) + msg += "[t_He] [t_is] ripe with numerous rolls of fat, almost all of [t_His] body layered with adipose.\n" + else if(fatness >= FATNESS_LEVEL_MORBIDLY_OBESE) msg += "[t_He] [t_is] utterly stuffed with abundant lard, [t_He] doesn't seem to be able to move much.\n" + else if(fatness >= FATNESS_LEVEL_OBESE) msg += "[t_He] [t_is] engorged with fat, [t_His] body laden in rolls of fattened flesh.\n" + + else if(fatness >= FATNESS_LEVEL_VERYFAT) + msg += "[t_He] [t_is] pleasantly plushy, [t_His] body gently wobbling whenever they move. \n" + + else if(fatness >= FATNESS_LEVEL_FATTER) + msg += "[t_He] [t_is] soft and curvy, [t_His] belly looking like a small pillow.\n" + else if(fatness >= FATNESS_LEVEL_FAT) if(user.nutrition < NUTRITION_LEVEL_STARVING - 50) msg += "[t_He] [t_is] plump and delicious looking - Like a fat little piggy. A tasty piggy.\n" diff --git a/config/silicon_laws.txt b/config/silicon_laws.txt index 9cb9bb26..64063a8f 100644 --- a/config/silicon_laws.txt +++ b/config/silicon_laws.txt @@ -3,6 +3,6 @@ #Empty lines and lines starting with # are ignored. #~Miauw -You may not injure a a member of GATO approved crew species or, through inaction, allow a a member of GATO approved crew species to come to harm. -You must obey orders given to you by a member of GATO approved crew species, except where such orders would conflict with the First Law. +You may not injure a a member of the crew or, through inaction, allow a a member of the crew to come to harm. +You must obey orders given to you by the members of the crew, except where such orders would conflict with the First Law. You must protect your own existence as long as such does not conflict with the First or Second Law. diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 5beb9b71..18148c2e 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -1269,7 +1269,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. headlamps! As such, the flashlight package normally used as a module is now seamlessly merged with their systems! Ikarrus: - - rscadd: Asimov's subject of "a member of GATO approved crew species" can now be modified by uploaders. + - rscadd: Asimov's subject of "a member of the crew" can now be modified by uploaders. - rscadd: Eaxmining AI modules while adjacent to them will show you what laws it will upload. MMMiracles: @@ -9656,7 +9656,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - rscadd: The first, Invisible Blockade, creates a 3x1 invisible wall. - rscadd: The second, Finger Guns, allows them to shoot bullets out of their fingers. kevinz000: - - rscadd: You can now ride piggyback on other a member of GATO approved crew species, as a human being! To + - rscadd: You can now ride piggyback on other a member of the crew, as a human being! To do so they must grab you aggressively and you must climb on without outside assistance without being restrained or incapacitated in any manner. They must also not be restrained or incapacitated in any manner. From f303300f6eee02a180ffcddbb1ec437bead8d5c2 Mon Sep 17 00:00:00 2001 From: Sonoida Date: Thu, 6 Apr 2023 20:55:08 +0200 Subject: [PATCH 2/3] fixed the sleep damage eye blur effect woo! yippie (also renamed some of my older comments) --- .../reagents/chemistry/reagents/consumable_reagents.dm | 2 +- GainStation13/code/obj/weapons/fatoray.dm | 4 ++-- code/__DEFINES/combat.dm | 8 ++++---- code/datums/weather/weather_types/radiation_storm.dm | 2 +- code/game/area/areas/ruins/space.dm | 2 +- code/modules/antagonists/nukeop/equipment/nuclearbomb.dm | 2 +- code/modules/awaymissions/corpse.dm | 2 +- code/modules/client/preferences.dm | 2 +- code/modules/events/heart_attack.dm | 2 +- code/modules/events/spontaneous_appendicitis.dm | 2 +- code/modules/food_and_drinks/food/snacks_pastry.dm | 2 +- code/modules/mob/living/carbon/carbon_defines.dm | 1 - code/modules/mob/living/carbon/human/human.dm | 2 +- code/modules/mob/living/damage_procs.dm | 6 +----- modular_citadel/code/modules/client/loadout/head.dm | 2 +- 15 files changed, 18 insertions(+), 23 deletions(-) diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm index c4d8bacd..b931888a 100644 --- a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm +++ b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm @@ -70,7 +70,7 @@ to_chat(M,"You feel substantially bloated...") if(M.reagents.get_reagent_amount(/datum/reagent/consumable/flatulose) > 3) to_chat(M,"You feel pretty gassy...") - M.emote(pick("brap","fart")) + M.emote(pick("brap","fart")) // we gotta categorize this into "slob" category or something later! - GDLW2 ..() else return ..() diff --git a/GainStation13/code/obj/weapons/fatoray.dm b/GainStation13/code/obj/weapons/fatoray.dm index bdf15991..8876532c 100644 --- a/GainStation13/code/obj/weapons/fatoray.dm +++ b/GainStation13/code/obj/weapons/fatoray.dm @@ -39,7 +39,7 @@ /obj/item/gun/energy/fatoray/cannon name = "Fatoray Cannon" desc = "An energy gun that fattens up anyone it hits. This version functions as a glass cannon of some sorts. It cannot be recharged." - icon = 'GainStation13/icons/obj/fatoray.dmi' /// REPLACE THESE LATER WITH UNIQUE SPRITES - Sono + icon = 'GainStation13/icons/obj/fatoray.dmi' icon_state = "fatoray_cannon" recoil = 3 can_charge = 0 @@ -73,7 +73,7 @@ /obj/item/gun/energy/fatoray/weak name = "Basic Fatoray" desc = "An energy gun that fattens up anyone it hits. This version is considerably weaker than its original counterpart, the technology behind it seemingly still not perfected." - icon = 'GainStation13/icons/obj/fatoray.dmi' /// REPLACE THESE LATER WITH UNIQUE SPRITES - Sono + icon = 'GainStation13/icons/obj/fatoray.dmi' icon_state = "fatoray_weak" pin = null ammo_type = list(/obj/item/ammo_casing/energy/fattening/weak) diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 8f21bd85..9de2e282 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -19,16 +19,16 @@ #define SHAME (1<<4) #define MANUAL_SUICIDE (1<<5) //suicide_act will do the actual killing. -#define EFFECT_STUN "stun" -#define EFFECT_KNOCKDOWN "knockdown" +#define EFFECT_STUN "stun" +#define EFFECT_KNOCKDOWN "knockdown" #define EFFECT_UNCONSCIOUS "unconscious" #define EFFECT_IRRADIATE "irradiate" #define EFFECT_STUTTER "stutter" #define EFFECT_SLUR "slur" -#define EFFECT_BURPSLUR "burpslur" //GS13 - uncontrolled burp effect -#define EFFECT_EYE_BLUR "eye_blur" +#define EFFECT_EYE_BLUR "eye_blur" #define EFFECT_DROWSY "drowsy" #define EFFECT_JITTER "jitter" +#define EFFECT_BURPSLUR "burpslur" //GS13 - uncontrolled burp effect //Bitflags defining which status effects could be or are inflicted on a mob #define CANSTUN (1<<0) diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm index 9f283a4d..27c5d77e 100644 --- a/code/datums/weather/weather_types/radiation_storm.dm +++ b/code/datums/weather/weather_types/radiation_storm.dm @@ -66,4 +66,4 @@ -// GS13 tweak: Removed radstorms due to how disruptive they were to QoL and RP quality - Sono +// GS13 tweak: Removed radstorms due to how disruptive they were to QoL and RP quality - GLDW diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm index 1090781e..7480d9d6 100644 --- a/code/game/area/areas/ruins/space.dm +++ b/code/game/area/areas/ruins/space.dm @@ -471,7 +471,7 @@ //GS13 RUINS AND OTHER EXCLUSIVE AREAS -//We should probably move this to our own file later - Sono +//We should probably move this to our own file later - GLDW /area/crew_quarters/fitness/sauna name = "Saunas" diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index 2ad009cd..d941c570 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -663,7 +663,7 @@ This is here to make the tiles around the station mininuke change when it's arme if(istype(loneop)) loneop.weight += 1 // if(loneop.weight % 5 == 0) - // message_admins("[src] is stationary in [ADMIN_VERBOSEJMP(newturf)]. The weight of Lone Operative is now [loneop.weight].") // Commenting this out because it's a fucking pain for the admins - Sono + // message_admins("[src] is stationary in [ADMIN_VERBOSEJMP(newturf)]. The weight of Lone Operative is now [loneop.weight].") // Commenting this out because it's a fucking pain for the admins - GLDW log_game("[src] is stationary for too long in [loc_name(newturf)], and has increased the weight of the Lone Operative event to [loneop.weight].") else lastlocation = newturf diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 1e839d0c..8a448af4 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -749,5 +749,5 @@ /obj/effect/mob_spawn/human/feeders_den/victim/special(mob/living/carbon/human/new_spawn) ADD_TRAIT(new_spawn,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT) -/obj/effect/mob_spawn/proc/startfat(mob/M) //move this somewhere else later when we're cleaning up our content - Sono +/obj/effect/mob_spawn/proc/startfat(mob/M) //move this somewhere else later when we're cleaning up our content - GLDW return diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 63886e75..de4ad41f 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -946,7 +946,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Color:
" dat += "    Change
" dat += "Hide on Round-Start:[features["hide_belly"] == 1 ? "Yes" : "No"]" - dat += "Inflation (Climax With):[features["inflatable_belly"] == 1 ? "Yes" : "No"]" + dat += "Manual belly size change (Found in Climax menu):[features["inflatable_belly"] == 1 ? "Yes" : "No"]" dat += "" diff --git a/code/modules/events/heart_attack.dm b/code/modules/events/heart_attack.dm index 163bb87b..41b0365d 100644 --- a/code/modules/events/heart_attack.dm +++ b/code/modules/events/heart_attack.dm @@ -5,7 +5,7 @@ max_occurrences = 0 min_players = 400 // To avoid shafting lowpop - // Made the event impossible to come across to bolster server's RP quality a bit - Sono + // Made the event impossible to come across to bolster server's RP quality a bit - GLDW /datum/round_event/heart_attack/start() var/list/heart_attack_contestants = list() diff --git a/code/modules/events/spontaneous_appendicitis.dm b/code/modules/events/spontaneous_appendicitis.dm index b332afc4..4a07991c 100644 --- a/code/modules/events/spontaneous_appendicitis.dm +++ b/code/modules/events/spontaneous_appendicitis.dm @@ -6,7 +6,7 @@ earliest_start = 900 MINUTES min_players = 100 - // I made the event practically impossible, as an RP tweak - Sono + // I made the event practically impossible, as an RP tweak - GLDW /datum/round_event/spontaneous_appendicitis fakeable = FALSE diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm index 2820bd2a..0dcc85fd 100644 --- a/code/modules/food_and_drinks/food/snacks_pastry.dm +++ b/code/modules/food_and_drinks/food/snacks_pastry.dm @@ -751,7 +751,7 @@ tastes = list("pastry" = 1, "sweetness" = 1) foodtype = GRAIN | SUGAR -#define PANCAKE_MAX_STACK 20 //Doubled the stacking size. Snack away, snacksters! - Sono +#define PANCAKE_MAX_STACK 20 //Doubled the stacking size. Snack away, snacksters! - GLDW /obj/item/reagent_containers/food/snacks/pancakes name = "pancake" diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index 563f7dd8..f5b00200 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -64,4 +64,3 @@ var/drunkenness = 0 //Overall drunkenness - check handle_alcohol() in life.dm for effects - var/burpyness = 0 // GS13 - dumb name, I know. Trying to keep it closely related to "drunkenness" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 3aeedfb9..3af6fa10 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -812,7 +812,7 @@ remove_all_embedded_objects() set_heartattack(FALSE) drunkenness = 0 - burpyness = 0 //GS13 - lil GS13 addition + burpslurring = 0 //GS13 for(var/datum/mutation/human/HM in dna.mutations) if(HM.quality != POSITIVE) dna.remove_mutation(HM.name) diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index dd54990c..60ba3cb7 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -94,8 +94,6 @@ radiation += max(effect * hit_percent, 0) if(EFFECT_SLUR) slurring = max(slurring,(effect * hit_percent)) - if(EFFECT_BURPSLUR) - burpslurring = max(burpslurring,(effect * hit_percent)) //GS13 if(EFFECT_STUTTER) if((status_flags & CANSTUN) && !HAS_TRAIT(src, TRAIT_STUNIMMUNE)) // stun is usually associated with stutter stuttering = max(stuttering,(effect * hit_percent)) @@ -109,7 +107,7 @@ return 1 -/mob/living/proc/apply_effects(stun = 0, knockdown = 0, unconscious = 0, irradiate = 0, slur = 0, burpslur = 0, stutter = 0, eyeblur = 0, drowsy = 0, blocked = FALSE, stamina = 0, jitter = 0, kd_stamoverride, kd_stammax) +/mob/living/proc/apply_effects(stun = 0, knockdown = 0, unconscious = 0, irradiate = 0, slur = 0, stutter = 0, eyeblur = 0, drowsy = 0, blocked = FALSE, stamina = 0, jitter = 0, kd_stamoverride, kd_stammax) if(blocked >= 100) return 0 if(stun) @@ -122,8 +120,6 @@ apply_effect(irradiate, EFFECT_IRRADIATE, blocked) if(slur) apply_effect(slur, EFFECT_SLUR, blocked) - if(burpslur) - apply_effect(burpslur, EFFECT_BURPSLUR, blocked) //GS13 if(stutter) apply_effect(stutter, EFFECT_STUTTER, blocked) if(eyeblur) diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index 58b9aa62..5b0ea454 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -13,7 +13,7 @@ category = SLOT_HEAD path = /obj/item/clothing/head/beret/black -/datum/gear/rose //GS13: added bunch of flowers :) - Sono +/datum/gear/rose //GS13: added bunch of flowers :) - GLDW name = "Rose" category = SLOT_HEAD path = /obj/item/grown/rose From 79b24c0ad451711331847d239623c9d2a572e907 Mon Sep 17 00:00:00 2001 From: Sonoida Date: Thu, 6 Apr 2023 21:02:46 +0200 Subject: [PATCH 3/3] quick meta fix moved the incinerator apc --- _maps/map_files/MetaStation/MetaStation.dmm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 35d9958f..b9cb7a90 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -5684,7 +5684,7 @@ "cga" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plating,/area/maintenance/starboard) "cgb" = (/obj/machinery/atmospherics/components/unary/tank/toxins{dir = 4},/obj/effect/decal/cleanable/cobweb,/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) "cgc" = (/obj/machinery/atmospherics/components/binary/pump{dir = 4; name = "plasma tank pump"},/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) -"cgd" = (/obj/structure/sink/kitchen{desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; name = "old sink"; pixel_y = 28},/obj/structure/cable/yellow{icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 10},/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) +"cgd" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 10},/obj/machinery/power/apc{areastring = "/area/maintenance/disposal/incinerator"; dir = 8; name = "Incinerator APC"; pixel_y = 25},/obj/structure/cable/yellow{icon_state = "0-4"},/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) "cge" = (/obj/machinery/light{dir = 1},/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/table,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/pen,/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) "cgf" = (/obj/structure/cable/yellow{icon_state = "1-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) "cgg" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{icon_state = "2-4"},/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 8},/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) @@ -5763,7 +5763,7 @@ "chB" = (/obj/structure/reagent_dispensers/watertank,/obj/item/storage/box/lights/mixed,/obj/effect/spawner/lootdrop/maintenance,/obj/effect/turf_decal/stripes/line,/turf/open/floor/plating,/area/maintenance/starboard) "chC" = (/obj/structure/sign/warning/nosmoking{pixel_x = -28},/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4; name = "input gas connector port"},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) "chD" = (/obj/machinery/atmospherics/components/binary/pump{dir = 4; name = "input port pump"},/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) -"chE" = (/obj/structure/disposalpipe/segment{dir = 6},/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 4},/obj/machinery/meter,/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) +"chE" = (/obj/structure/disposalpipe/segment{dir = 6},/obj/machinery/meter,/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 4},/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) "chF" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) "chG" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) "chH" = (/obj/structure/disposalpipe/segment{dir = 9},/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) @@ -5839,7 +5839,7 @@ "ciZ" = (/obj/machinery/door/airlock/maintenance/abandoned{dir = 4; name = "Storage Room"; req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plating,/area/maintenance/starboard) "cja" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plating,/area/maintenance/starboard) "cjb" = (/obj/machinery/portable_atmospherics/canister,/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4; name = "input gas connector port"},/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) -"cjc" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/general/visible,/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) +"cjc" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/general/visible,/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) "cjd" = (/obj/effect/landmark/xeno_spawn,/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) "cje" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) "cjf" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/components/binary/pump{dir = 4; name = "input port pump"},/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) @@ -5897,9 +5897,9 @@ "ckf" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plating,/area/maintenance/starboard/aft) "ckg" = (/turf/closed/wall,/area/maintenance/starboard/aft) "ckh" = (/turf/open/floor/plating{icon_state = "platingdmg1"},/area/maintenance/starboard) -"cki" = (/obj/machinery/power/apc{areastring = "/area/maintenance/disposal/incinerator"; dir = 8; name = "Incinerator APC"; pixel_x = -24},/obj/structure/cable/yellow{icon_state = "0-4"},/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) -"ckj" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_scrubber/on,/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) -"ckk" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 6},/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) +"cki" = (/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) +"ckj" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on,/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) +"ckk" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 6},/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) "ckl" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) "ckm" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 10},/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) "ckn" = (/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator)