Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul

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.

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()

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)

html/changelog.html

@@ -50,6 +50,16 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">23 September 2021</h2>
+			<h3 class="author">KrabSpider updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="code_imp">cryogenics ain't a candidate for anomaly spawns anymore.</li>
+			</ul>
+			<h3 class="author">buffyuwu updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">canvas and spray can are now sold in the fun vendor</li>
+			</ul>
+
 			<h2 class="date">22 September 2021</h2>
 			<h3 class="author">silicons updated:</h3>
 			<ul class="changes bgimages16">

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

html/changelogs/AutoChangeLog-pr-15183.yml

@@ -0,0 +1,4 @@
+author: "zeroisthebiggay"
+delete-after: True
+changes: 
+  - balance: "gremlins become shock immune"