From 11a414d8c874bf32ffff74404f6ea6968ccff62d Mon Sep 17 00:00:00 2001 From: KrabSpider Date: Mon, 20 Sep 2021 16:41:40 -0400 Subject: [PATCH 1/7] blacklists cryogenics from anomaly spawns adds cryogenics to the anomaly blacklist. --- code/modules/events/anomaly.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/events/anomaly.dm b/code/modules/events/anomaly.dm index 438904466c..926ff87c1d 100644 --- a/code/modules/events/anomaly.dm +++ b/code/modules/events/anomaly.dm @@ -24,7 +24,8 @@ /area/holodeck, /area/shuttle, /area/maintenance, - /area/science/test_area) + /area/science/test_area, + /area/commons/cryopod) ) //Subtypes from the above that actually should explode. From dbd601412917d262cac9c6c8186f7da82a2e3c78 Mon Sep 17 00:00:00 2001 From: buffyuwu <42501819+buffyuwu@users.noreply.github.com> Date: Tue, 21 Sep 2021 01:16:03 -0400 Subject: [PATCH 2/7] adds art supplies to the fun vendor because some maps don't have the canvas/easel :cl: add: canvas and spraycan are now sold in the fun vendor /:cl: --- code/modules/vending/games.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm index a1d9bc1691..7664a191c8 100644 --- a/code/modules/vending/games.dm +++ b/code/modules/vending/games.dm @@ -10,7 +10,9 @@ /obj/item/toy/cards/deck/unum = 3, /obj/item/cardpack/series_one = 10, /obj/item/dyespray=3, - /obj/item/tcgcard_binder = 5) + /obj/item/tcgcard_binder = 5, + /obj/item/canvas = 3, + /obj/item/toy/crayon/spraycan = 3) contraband = list(/obj/item/dice/fudge = 9) premium = list(/obj/item/melee/skateboard/pro = 3, /obj/item/melee/skateboard/hoverboard = 1) From e8617448eff372e7d7bcc7c371495e86592ca71e Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 22 Sep 2021 14:50:00 -0500 Subject: [PATCH 3/7] Automatic changelog generation for PR #15190 [ci skip] --- html/changelogs/AutoChangeLog-pr-15190.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15190.yml diff --git a/html/changelogs/AutoChangeLog-pr-15190.yml b/html/changelogs/AutoChangeLog-pr-15190.yml new file mode 100644 index 0000000000..4cf6d6d9d4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15190.yml @@ -0,0 +1,4 @@ +author: "buffyuwu" +delete-after: True +changes: + - rscadd: "canvas and spray can are now sold in the fun vendor" From ae4f7076dceb7db60228d090cc7b1a74597f1c45 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 22 Sep 2021 14:50:30 -0500 Subject: [PATCH 4/7] Automatic changelog generation for PR #15187 [ci skip] --- html/changelogs/AutoChangeLog-pr-15187.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15187.yml diff --git a/html/changelogs/AutoChangeLog-pr-15187.yml b/html/changelogs/AutoChangeLog-pr-15187.yml new file mode 100644 index 0000000000..607254a34e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15187.yml @@ -0,0 +1,4 @@ +author: "KrabSpider" +delete-after: True +changes: + - code_imp: "cryogenics ain't a candidate for anomaly spawns anymore." From fc73e2944f3779861b50084eb979a3ffedeb9233 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 23 Sep 2021 00:27:37 +0000 Subject: [PATCH 5/7] Automatic changelog compile [ci skip] --- html/changelog.html | 10 ++++++++++ html/changelogs/.all_changelog.yml | 5 +++++ html/changelogs/AutoChangeLog-pr-15187.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15190.yml | 4 ---- 4 files changed, 15 insertions(+), 8 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15187.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15190.yml diff --git a/html/changelog.html b/html/changelog.html index fd0a53e68c..734ebef9d1 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,16 @@ -->
+

23 September 2021

+

KrabSpider updated:

+
    +
  • cryogenics ain't a candidate for anomaly spawns anymore.
    • +
+

buffyuwu updated:

+
    +
  • canvas and spray can are now sold in the fun vendor
    • +
+

22 September 2021

silicons updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 09cb1c8117..e2d22e5b59 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -30063,3 +30063,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - bugfix: dice bags can only hold dice - rscdel: limb damage changes reverted - bugfix: crawling can't be adrenals'd +2021-09-23: + KrabSpider: + - code_imp: cryogenics ain't a candidate for anomaly spawns anymore. + buffyuwu: + - rscadd: canvas and spray can are now sold in the fun vendor diff --git a/html/changelogs/AutoChangeLog-pr-15187.yml b/html/changelogs/AutoChangeLog-pr-15187.yml deleted file mode 100644 index 607254a34e..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15187.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "KrabSpider" -delete-after: True -changes: - - code_imp: "cryogenics ain't a candidate for anomaly spawns anymore." diff --git a/html/changelogs/AutoChangeLog-pr-15190.yml b/html/changelogs/AutoChangeLog-pr-15190.yml deleted file mode 100644 index 4cf6d6d9d4..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15190.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "buffyuwu" -delete-after: True -changes: - - rscadd: "canvas and spray can are now sold in the fun vendor" From 7ba7f0d1c16fb59cde6815e2ef1dec9dad5a4f63 Mon Sep 17 00:00:00 2001 From: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com> Date: Thu, 23 Sep 2021 13:20:15 -0400 Subject: [PATCH 6/7] gremlins become shock immune (#15183) * Update gremlin.dm * Update gremlin.dm --- code/modules/mob/living/simple_animal/gremlin/gremlin.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/simple_animal/gremlin/gremlin.dm b/code/modules/mob/living/simple_animal/gremlin/gremlin.dm index 61436cea1c..a6312b9ddf 100644 --- a/code/modules/mob/living/simple_animal/gremlin/gremlin.dm +++ b/code/modules/mob/living/simple_animal/gremlin/gremlin.dm @@ -66,6 +66,7 @@ GLOBAL_LIST(bad_gremlin_items) /mob/living/simple_animal/hostile/gremlin/Initialize() . = ..() AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS) + ADD_TRAIT(src, TRAIT_SHOCKIMMUNE, INNATE_TRAIT) access_card = new /obj/item/card/id(src) var/datum/job/captain/C = new /datum/job/captain access_card.access = C.get_access() From 7623ea95584307f07ee72967e70046a34470d3f1 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 23 Sep 2021 12:20:18 -0500 Subject: [PATCH 7/7] Automatic changelog generation for PR #15183 [ci skip] --- html/changelogs/AutoChangeLog-pr-15183.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15183.yml diff --git a/html/changelogs/AutoChangeLog-pr-15183.yml b/html/changelogs/AutoChangeLog-pr-15183.yml new file mode 100644 index 0000000000..9ceef17df2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15183.yml @@ -0,0 +1,4 @@ +author: "zeroisthebiggay" +delete-after: True +changes: + - balance: "gremlins become shock immune"