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/12] 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 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 02/12] 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 03/12] 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 04/12] 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 05/12] 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 06/12] 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 07/12] 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 08/12] 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 09/12] 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 10/12] 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 11/12] 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 12/12] 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"