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)