Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into PSFluffBunny

code/modules/clothing/spacesuits/hardsuit.dm

@@ -465,9 +465,13 @@
 //Strike team hardsuits
 /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/sst
 	armor = list(melee = 70, bullet = 70, laser = 50, energy = 40, bomb = 80, bio = 100, rad = 100) //Almost as good as DS gear, but unlike DS can switch to combat for mobility
+	icon_state = "hardsuit0-sst"
+	item_color = "sst"
 
 /obj/item/clothing/suit/space/hardsuit/syndi/elite/sst
 	armor = list(melee = 70, bullet = 70, laser = 50, energy = 40, bomb = 80, bio = 100, rad = 100)
+	icon_state = "hardsuit0-sst"
+	item_color = "sst"
 
 /obj/item/clothing/suit/space/hardsuit/syndi/freedom
 	name = "eagle suit"

code/modules/games/cards.dm

@@ -219,6 +219,8 @@
 	var/mob/M = usr
 	if(M.incapacitated() || !Adjacent(M))
 		return
+	if(!ishuman(M))
+		return
 
 	if(over_object == M || istype(over_object, /obj/screen))
 		if(!remove_item_from_storage(M))

code/modules/mob/living/simple_animal/friendly/mouse.dm

@@ -5,6 +5,7 @@
 	icon_state = "mouse_gray"
 	icon_living = "mouse_gray"
 	icon_dead = "mouse_gray_dead"
+	icon_resting = "mouse_gray_sleep"
 	speak = list("Squeek!","SQUEEK!","Squeek?")
 	speak_emote = list("squeeks","squeaks","squiks")
 	emote_hear = list("squeeks","squeaks","squiks")
@@ -69,6 +70,7 @@
 	icon_state = "mouse_[mouse_color]"
 	icon_living = "mouse_[mouse_color]"
 	icon_dead = "mouse_[mouse_color]_dead"
+	icon_resting = "mouse_[mouse_color]_sleep"
 	desc = "It's a small [mouse_color] rodent, often seen hiding in maintenance areas and making a nuisance of itself."
 
 /mob/living/simple_animal/mouse/proc/splat()
@@ -121,7 +123,7 @@
 
 	if(on_CD == 1)
 		return
-	
+
 	switch(act)
 		if("squeak")
 			message = "<B>\The [src]</B> squeaks!"
@@ -207,4 +209,16 @@
 
 /mob/living/simple_animal/mouse/blobinfected/get_scooped(mob/living/carbon/grabber)
 	to_chat(grabber, "<span class='warning'>You try to pick up [src], but they slip out of your grasp!</span>")
-	to_chat(src, "<span class='warning'>[src] tries to pick you up, but you wriggle free of their grasp!</span>")
+	to_chat(src, "<span class='warning'>[src] tries to pick you up, but you wriggle free of their grasp!</span>")
+
+/mob/living/simple_animal/mouse/fluff/clockwork
+	name = "Chip"
+	real_name = "Chip"
+	mouse_color = "clockwork"
+	icon_state = "mouse_clockwork"
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "stamps on"
+	gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
+	can_collar = 0
+	butcher_results = list(/obj/item/stack/sheet/metal = 1)

code/modules/paperwork/paperbin.dm

@@ -30,6 +30,8 @@
 	var/mob/M = usr
 	if(M.restrained() || M.stat || !Adjacent(M))
 		return
+	if(!ishuman(M))
+		return
 
 	if(over_object == M)
 		if(!remove_item_from_storage(M))

code/modules/reagents/reagent_containers/hypospray.dm

@@ -144,7 +144,7 @@
 
 /obj/item/reagent_containers/hypospray/autoinjector/stimulants
 	name = "Stimulants autoinjector"
-	desc = "Rapidly stimulates and regernates the body's organ system."
+	desc = "Rapidly stimulates and regenerates the body's organ system."
 	icon_state = "stimpen"
 	amount_per_transfer_from_this = 50
 	possible_transfer_amounts = list(50)