From 2522b846671645f21ca48ab9c94a87c3da1ed8be Mon Sep 17 00:00:00 2001 From: buffyuwu <42501819+buffyuwu@users.noreply.github.com> Date: Wed, 22 Sep 2021 01:56:13 -0400 Subject: [PATCH 01/15] ports a downstream fix of accordions while fixing this downstream at fortuna i realized we hadn't fixed this upstream whee --- code/modules/instruments/instrument_data/hardcoded.dm | 8 ++++---- code/modules/instruments/instrument_data/organ.dm | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/instruments/instrument_data/hardcoded.dm b/code/modules/instruments/instrument_data/hardcoded.dm index 757fea08a8..5db7e8b3bb 100644 --- a/code/modules/instruments/instrument_data/hardcoded.dm +++ b/code/modules/instruments/instrument_data/hardcoded.dm @@ -7,11 +7,11 @@ instrument_flags = INSTRUMENT_LEGACY volume_multiplier = 1 //not as loud as synth'd -/datum/instrument/hardcoded/accordian - name = "Accordian" - id = "accordian" +/datum/instrument/hardcoded/accordion + name = "Accordion" + id = "accordion" legacy_instrument_ext = "mid" - legacy_instrument_path = "accordian" + legacy_instrument_path = "accordion" /datum/instrument/hardcoded/bikehorn name = "Bike Horn" diff --git a/code/modules/instruments/instrument_data/organ.dm b/code/modules/instruments/instrument_data/organ.dm index 25da740998..edf9de9485 100644 --- a/code/modules/instruments/instrument_data/organ.dm +++ b/code/modules/instruments/instrument_data/organ.dm @@ -19,8 +19,8 @@ "60"='sound/instruments/synthesis_samples/organ/crisis_hammond/c4.ogg', "72"='sound/instruments/synthesis_samples/organ/crisis_hammond/c5.ogg') -/datum/instrument/organ/crisis_accordian - name = "Crisis Accordian" +/datum/instrument/organ/crisis_accordion + name = "Crisis Accordion" id = "crack" real_samples = list("36"='sound/instruments/synthesis_samples/organ/crisis_accordian/c2.ogg', "48"='sound/instruments/synthesis_samples/organ/crisis_accordian/c3.ogg', @@ -34,8 +34,8 @@ "60"='sound/instruments/synthesis_samples/organ/crisis_harmonica/c4.ogg', "72"='sound/instruments/synthesis_samples/organ/crisis_harmonica/c5.ogg') -/datum/instrument/organ/crisis_tango_accordian - name = "Crisis Tango Accordian" +/datum/instrument/organ/crisis_tango_accordion + name = "Crisis Tango Accordion" id = "crtango" real_samples = list("36"='sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c2.ogg', "48"='sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c3.ogg', From 70cdd264dc5dc66ca03be21cd056e7250bffb57b Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 24 Sep 2021 00:26:31 +0000 Subject: [PATCH 02/15] Automatic changelog compile [ci skip] --- html/changelog.html | 12 ++++++------ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/AutoChangeLog-pr-15183.yml | 4 ---- 3 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15183.yml diff --git a/html/changelog.html b/html/changelog.html index 734ebef9d1..a73295461d 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,12 @@ -->
+

24 September 2021

+

zeroisthebiggay updated:

+ +

23 September 2021

KrabSpider updated:

GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index e2d22e5b59..5086f469c7 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -30068,3 +30068,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - code_imp: cryogenics ain't a candidate for anomaly spawns anymore. buffyuwu: - rscadd: canvas and spray can are now sold in the fun vendor +2021-09-24: + zeroisthebiggay: + - balance: gremlins become shock immune diff --git a/html/changelogs/AutoChangeLog-pr-15183.yml b/html/changelogs/AutoChangeLog-pr-15183.yml deleted file mode 100644 index 9ceef17df2..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15183.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "zeroisthebiggay" -delete-after: True -changes: - - balance: "gremlins become shock immune" From c633c9591979a093f45d7e74733363c395fa2096 Mon Sep 17 00:00:00 2001 From: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com> Date: Fri, 24 Sep 2021 18:35:49 -0400 Subject: [PATCH 03/15] Update space.dm --- code/datums/ruins/space.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index 64b8692ccd..9caddbc163 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -331,6 +331,12 @@ name = "Space Diner" description = "Come, traveler of the bluespace planes. Sit, enjoy a drink and take one of the fair maidens for a night. The exit is the way you came in, via that teleporter thingy, but do remember to stay safe." +/datum/map_template/ruin/space/suspicious + id = "helterskelter" + suffix = "skelter.dmm" + name = "Helter Skelter" + description = "You're looking mighty suspicious. Why don't you go and take a seat over in that driver?"" + //Space ruins for the station z /datum/map_template/ruin/spacenearstation prefix = "_maps/RandomRuins/SpaceRuinsStation/" From 5366a09c8b1c89dec190a6983cf865c8ee6fbb0b Mon Sep 17 00:00:00 2001 From: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com> Date: Fri, 24 Sep 2021 18:38:58 -0400 Subject: [PATCH 04/15] Update spaceRuinBlacklist.txt --- config/spaceRuinBlacklist.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/config/spaceRuinBlacklist.txt b/config/spaceRuinBlacklist.txt index 969e4135f6..c62408b90c 100644 --- a/config/spaceRuinBlacklist.txt +++ b/config/spaceRuinBlacklist.txt @@ -53,3 +53,4 @@ #_maps/RandomRuins/SpaceRuins/spacehermit.dmm #_maps/RandomRuins/SpaceRuins/advancedlab.dmm #_maps/RandomRuins/SpaceRuins/spacediner.dmm +#_maps/RandomRuins/SpaceRuins/skelter.dmm From 72cb19eb3fa6e614ce55bcb29aefde062d6032aa Mon Sep 17 00:00:00 2001 From: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com> Date: Fri, 24 Sep 2021 19:15:32 -0400 Subject: [PATCH 05/15] Update space.dm --- code/datums/ruins/space.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index 9caddbc163..7a57e50364 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -335,7 +335,7 @@ id = "helterskelter" suffix = "skelter.dmm" name = "Helter Skelter" - description = "You're looking mighty suspicious. Why don't you go and take a seat over in that driver?"" + description = "You're looking mighty suspicious. Why don't you go and take a seat over in that driver?" //Space ruins for the station z /datum/map_template/ruin/spacenearstation From 410bac56858782b614a629d8ebfef610ac2c7357 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 24 Sep 2021 19:14:16 -0500 Subject: [PATCH 06/15] Automatic changelog generation for PR #15192 [ci skip] --- html/changelogs/AutoChangeLog-pr-15192.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15192.yml diff --git a/html/changelogs/AutoChangeLog-pr-15192.yml b/html/changelogs/AutoChangeLog-pr-15192.yml new file mode 100644 index 0000000000..7c1ce611b2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15192.yml @@ -0,0 +1,4 @@ +author: "buffyuwu" +delete-after: True +changes: + - bugfix: "fixes accordions" From 53f75ec0cf06040cc08db0c536b6af288fdfecb2 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 25 Sep 2021 00:26:03 +0000 Subject: [PATCH 07/15] Automatic changelog compile [ci skip] --- html/changelog.html | 25 ++++++---------------- html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/AutoChangeLog-pr-15192.yml | 4 ---- 3 files changed, 9 insertions(+), 23 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15192.yml diff --git a/html/changelog.html b/html/changelog.html index a73295461d..a2fe68aa3c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,12 @@ -->
+

25 September 2021

+

buffyuwu updated:

+
    +
  • fixes accordions
    • +
+

24 September 2021

zeroisthebiggay updated:

    @@ -535,25 +541,6 @@
    • Removes a sneaky transform button on the vore panel.
    - -

    24 July 2021

    -

    MrJWhit updated:

    -
      -
    • Replaces the northwest maint room on box with a sadness room
      • -
    • Replaces bar stripper room with an arcade on boxstation
      • -
    • Squished the west bathrooms a bit and made a room to sell things on boxstation.
      • -
    • Southeast maint hallway on box is now ziggy and zaggier.
      • -
    • Fixed pipes being not connected with the recent map PR for boxstation.
      • -
    -

    Putnam3145 updated:

    -
      -
    • hallucination now bottoms out at 0
      • -
    • supermatter now causes only half the hallucinations
      • -
    -

    cadyn updated:

    -
      -
    • auxmos bump for dependencies.sh
      • -
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 5086f469c7..3b5cb2644b 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -30071,3 +30071,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2021-09-24: zeroisthebiggay: - balance: gremlins become shock immune +2021-09-25: + buffyuwu: + - bugfix: fixes accordions diff --git a/html/changelogs/AutoChangeLog-pr-15192.yml b/html/changelogs/AutoChangeLog-pr-15192.yml deleted file mode 100644 index 7c1ce611b2..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15192.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "buffyuwu" -delete-after: True -changes: - - bugfix: "fixes accordions" From 58df5b70bf094c25da4c90e2f3e5f786689bcd54 Mon Sep 17 00:00:00 2001 From: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com> Date: Sat, 25 Sep 2021 19:09:22 -0400 Subject: [PATCH 08/15] Update plaguerat.dm --- code/modules/mob/living/simple_animal/hostile/plaguerat.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/plaguerat.dm b/code/modules/mob/living/simple_animal/hostile/plaguerat.dm index 2b92894317..d6c956ba7b 100644 --- a/code/modules/mob/living/simple_animal/hostile/plaguerat.dm +++ b/code/modules/mob/living/simple_animal/hostile/plaguerat.dm @@ -136,7 +136,6 @@ GLOBAL_LIST_EMPTY(plague_rats) if(LAZYLEN(GLOB.plague_rats) >= cap) visible_message("[src] gnaws into its food, [cap] rats are now on the station!") return - var/mob/living/newmouse = new /mob/living/simple_animal/hostile/plaguerat(loc) visible_message("[src] gnaws into its food, attracting another rat!") /mob/living/simple_animal/hostile/plaguerat/proc/exit_vents() From be82bd310ed131510d32ecba43bbb642e05fc688 Mon Sep 17 00:00:00 2001 From: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com> Date: Sat, 25 Sep 2021 19:17:43 -0400 Subject: [PATCH 09/15] Update plaguerat.dm --- code/modules/mob/living/simple_animal/hostile/plaguerat.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/simple_animal/hostile/plaguerat.dm b/code/modules/mob/living/simple_animal/hostile/plaguerat.dm index d6c956ba7b..497359829e 100644 --- a/code/modules/mob/living/simple_animal/hostile/plaguerat.dm +++ b/code/modules/mob/living/simple_animal/hostile/plaguerat.dm @@ -136,6 +136,7 @@ GLOBAL_LIST_EMPTY(plague_rats) if(LAZYLEN(GLOB.plague_rats) >= cap) visible_message("[src] gnaws into its food, [cap] rats are now on the station!") return + new /mob/living/simple_animal/hostile/plaguerat(loc) visible_message("[src] gnaws into its food, attracting another rat!") /mob/living/simple_animal/hostile/plaguerat/proc/exit_vents() From 6c00bb8dce9cc7b0f8a99f6d2f55722de50434fe Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 26 Sep 2021 06:41:09 -0700 Subject: [PATCH 10/15] Update living_blocking_parrying.dm (#15208) --- code/modules/mob/living/living_blocking_parrying.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/living_blocking_parrying.dm b/code/modules/mob/living/living_blocking_parrying.dm index 0ccc03982a..bdc44ab356 100644 --- a/code/modules/mob/living/living_blocking_parrying.dm +++ b/code/modules/mob/living/living_blocking_parrying.dm @@ -166,7 +166,7 @@ GLOBAL_LIST_EMPTY(block_parry_data) /// Clickdelay duration post-parry if you fail to parry an attack var/parry_failed_clickcd_duration = 0 SECONDS /// Parry cooldown post-parry if failed. This is ADDED to parry_cooldown!!! - var/parry_failed_cooldown_duration = 0 SECONDS + var/parry_failed_cooldown_duration = 3.5 SECONDS // Advanced /// Flags added to return value From 4e2801a0ddae641b52eb507732884076c4100480 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 26 Sep 2021 12:04:29 -0500 Subject: [PATCH 11/15] Automatic changelog generation for PR #15200 [ci skip] --- html/changelogs/AutoChangeLog-pr-15200.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15200.yml diff --git a/html/changelogs/AutoChangeLog-pr-15200.yml b/html/changelogs/AutoChangeLog-pr-15200.yml new file mode 100644 index 0000000000..9d1b65e651 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15200.yml @@ -0,0 +1,4 @@ +author: "zeroisthebiggay" +delete-after: True +changes: + - bugfix: "helter skelter actually spawns" From 11e70bf04433af73c1223b94539d9bd418d4b9e5 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 26 Sep 2021 15:30:43 -0500 Subject: [PATCH 12/15] Automatic changelog generation for PR #15205 [ci skip] --- html/changelogs/AutoChangeLog-pr-15205.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15205.yml diff --git a/html/changelogs/AutoChangeLog-pr-15205.yml b/html/changelogs/AutoChangeLog-pr-15205.yml new file mode 100644 index 0000000000..2c8663f4a3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15205.yml @@ -0,0 +1,4 @@ +author: "zeroisthebiggay" +delete-after: True +changes: + - bugfix: "code\\modules\\mob\\living\\simple_animal\\hostile\\plaguerat.dm:139:warning: newmouse: variable defined but not used" From 1992bf7cfb88a8378eeefee7193359c937cfea99 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 27 Sep 2021 00:26:02 +0000 Subject: [PATCH 13/15] Automatic changelog compile [ci skip] --- html/changelog.html | 13 +++++++------ html/changelogs/.all_changelog.yml | 5 +++++ html/changelogs/AutoChangeLog-pr-15200.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15205.yml | 4 ---- 4 files changed, 12 insertions(+), 14 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15200.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15205.yml diff --git a/html/changelog.html b/html/changelog.html index a2fe68aa3c..189413b690 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,13 @@ -->
+

27 September 2021

+

zeroisthebiggay updated:

+
    +
  • helter skelter actually spawns
    • +
  • code\modules\mob\living\simple_animal\hostile\plaguerat.dm:139:warning: newmouse: variable defined but not used
    • +
+

25 September 2021

buffyuwu updated:

    @@ -535,12 +542,6 @@
  • Generic fires work now
  • A knock-on effect of the HE pipe change is that space cooling is ~8.4x as powerful
- -

26 July 2021

-

SandPoot updated:

-
    -
  • Removes a sneaky transform button on the vore panel.
    • -
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 3b5cb2644b..5f6d3af405 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -30074,3 +30074,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2021-09-25: buffyuwu: - bugfix: fixes accordions +2021-09-27: + zeroisthebiggay: + - bugfix: helter skelter actually spawns + - bugfix: 'code\modules\mob\living\simple_animal\hostile\plaguerat.dm:139:warning: + newmouse: variable defined but not used' diff --git a/html/changelogs/AutoChangeLog-pr-15200.yml b/html/changelogs/AutoChangeLog-pr-15200.yml deleted file mode 100644 index 9d1b65e651..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15200.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "zeroisthebiggay" -delete-after: True -changes: - - bugfix: "helter skelter actually spawns" diff --git a/html/changelogs/AutoChangeLog-pr-15205.yml b/html/changelogs/AutoChangeLog-pr-15205.yml deleted file mode 100644 index 2c8663f4a3..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15205.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "zeroisthebiggay" -delete-after: True -changes: - - bugfix: "code\\modules\\mob\\living\\simple_animal\\hostile\\plaguerat.dm:139:warning: newmouse: variable defined but not used" From 41169d4366376da28171ad7a04d5aec102ec5ef3 Mon Sep 17 00:00:00 2001 From: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com> Date: Mon, 27 Sep 2021 11:49:01 -0400 Subject: [PATCH 14/15] helter skelter fixes so it doesn't break comms and does not come with a fucking uplink (#15210) * . * . --- _maps/RandomRuins/SpaceRuins/skelter.dmm | 330 +++++++++++++---------- 1 file changed, 195 insertions(+), 135 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/skelter.dmm b/_maps/RandomRuins/SpaceRuins/skelter.dmm index 8dd0b3b5e1..694d093eeb 100644 --- a/_maps/RandomRuins/SpaceRuins/skelter.dmm +++ b/_maps/RandomRuins/SpaceRuins/skelter.dmm @@ -875,7 +875,8 @@ /area/service/cafeteria) "cj" = ( /obj/effect/decal/cleanable/blood/old, -/obj/item/clothing/suit/space/syndicate/orange, +/obj/item/clothing/suit/space/syndicate/green/dark, +/obj/item/clothing/head/helmet/space/syndicate/green/dark, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/skelter/sec) "ck" = ( @@ -1366,6 +1367,9 @@ dir = 1; icon_state = "trimline_fill" }, +/mob/living/simple_animal/hostile/syndicate/melee/sword/space{ + name = "Impostrous Commando" + }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/skelter/nav) "ds" = ( @@ -1895,6 +1899,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/item/clothing/head/helmet/space/syndicate/blue, /turf/open/floor/plating, /area/ruin/space/has_grav/skelter/engine/powerstorage) "eC" = ( @@ -2483,6 +2488,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/item/clothing/head/helmet/space/syndicate, /turf/open/floor/plating, /area/ruin/space/has_grav/skelter/engine/powerstorage) "fR" = ( @@ -2581,6 +2587,7 @@ /obj/item/clothing/suit/space/syndicate/orange{ desc = "Wait, don't these normally come with a helmet?" }, +/obj/item/clothing/head/helmet/space/syndicate/orange, /turf/open/floor/plating, /area/ruin/space/has_grav/skelter/forehall) "gg" = ( @@ -2726,6 +2733,7 @@ dir = 1; pixel_y = -24 }, +/obj/item/clothing/head/helmet/space/syndicate/green, /turf/open/floor/carpet, /area/ruin/space/has_grav/skelter/admin) "gx" = ( @@ -2823,6 +2831,10 @@ /area/ruin/space/has_grav/skelter/engine/lower) "gH" = ( /obj/structure/rack, +/obj/item/dnainjector/tonguespike{ + desc = "It's a little suspicious."; + name = "suspicious serum" + }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/skelter/sec) "gI" = ( @@ -2907,18 +2919,18 @@ /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/skelter/shields) "gT" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8; - icon_state = "scrub_map_on-2" - }, /obj/structure/cable/yellow{ icon_state = "0-8" }, /obj/machinery/power/apc{ + cell_type = null; dir = 1; name = "Shield Room APC"; pixel_y = 23 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 8 + }, /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/skelter/shields) "gU" = ( @@ -3136,7 +3148,9 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/turf/open/floor/mineral/titanium/white, +/turf/open/floor/plating/airless{ + icon_state = "platingdmg1" + }, /area/ruin/space/has_grav/skelter/shields) "hp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -3325,7 +3339,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/turf/open/floor/mineral/titanium/white, +/turf/open/floor/plating/airless{ + icon_state = "platingdmg2" + }, /area/ruin/space/has_grav/skelter/shields) "hO" = ( /obj/machinery/shieldgen, @@ -3523,18 +3539,20 @@ /turf/open/floor/circuit, /area/ruin/space/has_grav/skelter/shields) "il" = ( -/turf/open/floor/mineral/titanium/white, +/obj/structure/lattice, +/turf/open/space/basic, /area/ruin/space/has_grav/skelter/shields) "im" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/obj/machinery/light, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 }, -/turf/open/floor/mineral/titanium/white, +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 1 + }, +/turf/open/floor/plating/airless{ + icon_state = "platingdmg3" + }, /area/ruin/space/has_grav/skelter/shields) "in" = ( /turf/open/floor/plasteel{ @@ -3722,10 +3740,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/item/uplink/old{ - pixel_x = -4; - pixel_y = 8 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4; icon_state = "scrub_map_on-2" @@ -3839,7 +3853,10 @@ /area/ruin/space/has_grav/skelter/comms) "iP" = ( /obj/structure/rack, -/obj/item/gun/ballistic/automatic/pistol, +/obj/item/book/granter/martial/cqc{ + name = "dusty manual"; + used = 1 + }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/skelter/sec) "iQ" = ( @@ -3874,20 +3891,6 @@ }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/skelter/storage) -"iU" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/machinery/telecomms/relay/preset/auto, -/turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/skelter/comms) "iV" = ( /obj/structure/chair/comfy/teal, /obj/effect/turf_decal/tile/blue, @@ -3917,6 +3920,7 @@ /obj/item/clothing/suit/space/syndicate/black{ desc = "Wait, don't these normally come with a helmet?" }, +/obj/item/clothing/head/helmet/space/syndicate/black, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/comms) "iX" = ( @@ -4078,7 +4082,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/machinery/telecomms/allinone, +/mob/living/simple_animal/hostile/syndicate/melee/space{ + name = "Impostrous Commando" + }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/comms) "jo" = ( @@ -4146,12 +4152,6 @@ /obj/item/gun/ballistic/automatic/pistol/no_mag, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/comms) -"jw" = ( -/turf/open/space/basic, -/area/space/nearstation) -"jx" = ( -/turf/open/space/basic, -/area/template_noop) "jy" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -4166,6 +4166,66 @@ /obj/item/ammo_casing/c10mm, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/comms) +"sg" = ( +/obj/effect/turf_decal/weather, +/turf/open/floor/plating/airless, +/area/ruin/space/has_grav/skelter/shields) +"vv" = ( +/mob/living/simple_animal/hostile/syndicate/melee/space{ + name = "Impostrous Commando" + }, +/turf/open/floor/plasteel/showroomfloor, +/area/ruin/space/has_grav/skelter/engine/powerstorage) +"vz" = ( +/obj/structure/fluff/broken_flooring{ + icon_state = "singular" + }, +/turf/open/floor/plating/airless{ + icon_state = "platingdmg3" + }, +/area/ruin/space/has_grav/skelter/shields) +"AJ" = ( +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav/skelter/shields) +"AR" = ( +/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space{ + name = "Impostrous Commando" + }, +/turf/open/floor/plasteel/dark, +/area/ruin/space/has_grav/skelter/sec) +"JR" = ( +/obj/effect/turf_decal/weather, +/turf/open/floor/plating/airless{ + icon_state = "platingdmg2" + }, +/area/ruin/space/has_grav/skelter/shields) +"Li" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/ruin/space/has_grav/skelter/shields) +"OA" = ( +/obj/structure/fluff/broken_flooring{ + icon_state = "singular" + }, +/turf/template_noop, +/area/template_noop) +"WM" = ( +/obj/effect/turf_decal/weather, +/turf/open/floor/plating/airless, +/area/ruin/unpowered/no_grav) +"Zs" = ( +/obj/item/shard{ + icon_state = "medium" + }, +/obj/structure/fluff/broken_flooring{ + dir = 8; + icon_state = "pile" + }, +/turf/template_noop, +/area/template_noop) (1,1,1) = {" ah @@ -4483,7 +4543,7 @@ cF cF ex eW -cF +AR fN gj hJ @@ -4525,7 +4585,7 @@ iI iQ iY ji -jx +ah "} (13,1,1) = {" ah @@ -4549,7 +4609,7 @@ gj iP gl hx -hx +vv is hx eA @@ -4705,7 +4765,7 @@ fV hX jb jj -jw +ah "} (19,1,1) = {" ah @@ -4885,7 +4945,7 @@ gO iT jf jk -jw +ah "} (25,1,1) = {" ay @@ -4942,7 +5002,7 @@ hH ih iG iN -iU +iO ii jl ah @@ -5091,10 +5151,10 @@ hn hM ik iH -gA -bx -ae -ah +gz +bL +bL +ak ah "} (32,1,1) = {" @@ -5118,13 +5178,13 @@ ga gx gR ho -hM +Li +vz il -il -gA -ae -ah -ah +sg +bL +ak +ak ah "} (33,1,1) = {" @@ -5150,12 +5210,12 @@ gS hp hN im -gA -gU -ah -ah -ah -ah +sg +JR +ac +ak +ak +bq "} (34,1,1) = {" ah @@ -5179,13 +5239,13 @@ gz gT hq hO -gA -gU -ah -ah -ah -ah -ah +gz +sg +WM +ac +ak +ak +cl "} (35,1,1) = {" aS @@ -5207,15 +5267,15 @@ dV gd gA gU -gU -gU -gU -ah -ah -ah -ah -ah -ah +gz +AJ +gz +ac +ac +ac +ac +ak +aZ "} (36,1,1) = {" ah @@ -5237,15 +5297,15 @@ fI ge gB gV -jw -ah -ah -ah -ah -ah -ah -ah -ah +aZ +ac +ak +ak +ac +ac +ac +ac +aZ "} (37,1,1) = {" ah @@ -5267,15 +5327,15 @@ cR gf ct cR -ah -ah -ah -ah -ah -ah -ah -ah -ah +aZ +ak +ak +ak +ak +ac +ac +ac +Zs "} (38,1,1) = {" ah @@ -5296,16 +5356,16 @@ bx dV ct ct -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah +aZ +aZ +ac +ak +ak +ak +ak +ak +ac +aZ "} (39,1,1) = {" ah @@ -5326,16 +5386,16 @@ cu cb ae ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah +OA +cl +do +ac +ak +ak +ak +ac +aZ +aS "} (40,1,1) = {" ah @@ -5356,15 +5416,15 @@ fr cc ah ah +do +aS +bq ah +aZ +aZ ah -ah -ah -ah -ah -ah -ah -ah +aZ +aS ah "} (41,1,1) = {" @@ -5387,13 +5447,13 @@ cc ah ah ah +aZ +do ah ah -ah -ah -ah -ah -ah +do +aZ +ba ah ah "} @@ -5419,12 +5479,12 @@ ah ah ah ah +bF ah ah ah ah -ah -ah +aZ ah "} (43,1,1) = {" @@ -5445,15 +5505,15 @@ ce ce ce ah +aZ +cl ah ah ah +aZ +aS ah -ah -ah -ah -ah -ah +cl ah ah "} @@ -5476,7 +5536,7 @@ ah ah ah ah -ah +bq ah ah ah From e8931415739a7af53c834b5f4d2c348ae6b8047f Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 27 Sep 2021 10:49:05 -0500 Subject: [PATCH 15/15] Automatic changelog generation for PR #15210 [ci skip] --- html/changelogs/AutoChangeLog-pr-15210.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15210.yml diff --git a/html/changelogs/AutoChangeLog-pr-15210.yml b/html/changelogs/AutoChangeLog-pr-15210.yml new file mode 100644 index 0000000000..1dae3adf10 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15210.yml @@ -0,0 +1,5 @@ +author: "zeroisthebiggay" +delete-after: True +changes: + - balance: "helter skelter loot insanity" + - bugfix: "helter skelter comms insanity"