Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos

code/modules/mob/dead/new_player/sprite_accessories/caps.dm

@@ -1,4 +1,4 @@
-datum/sprite_accessory/caps
+/datum/sprite_accessory/caps
 	icon = 'icons/mob/mutant_bodyparts.dmi'
 	color_src = HAIR
 	relevant_layers = list(BODY_ADJ_LAYER)

code/modules/mob/dead/new_player/sprite_accessories/socks.dm

@@ -11,6 +11,11 @@
 
 // please make sure they're sorted alphabetically and categorized
 
+/datum/sprite_accessory/underwear/socks/garter
+	name = "Garter"
+	icon_state = "garter"
+	has_color = TRUE
+
 /datum/sprite_accessory/underwear/socks/socks_knee
 	name = "Knee-high"
 	icon_state = "socks_knee"

code/modules/mob/dead/new_player/sprite_accessories/tails.dm

@@ -757,7 +757,7 @@
 	icon_state = "husky"
 	matrixed_sections = MATRIX_RED_GREEN
 
-datum/sprite_accessory/tails/mam_tails/insect
+/datum/sprite_accessory/tails/mam_tails/insect
 	name = "Insect"
 	icon_state = "insect"
 	matrixed_sections = MATRIX_RED

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -923,7 +923,8 @@
 		/obj/item/cyborg_clamp,
 		/obj/item/stack/marker_beacon,
 		/obj/item/destTagger,
-		/obj/item/stack/packageWrap)
+		/obj/item/stack/packageWrap,
+		/obj/item/card/id/miningborg)
 	emag_modules = list(/obj/item/borg/stun)
 	ratvar_modules = list(
 		/obj/item/clockwork/slab/cyborg/miner,

code/modules/mob/living/simple_animal/hostile/bear.dm

@@ -109,7 +109,7 @@
 		to_chat(user, "<span class='info'>You strap the armor plating to [A] and sharpen [A.p_their()] claws with the nail filer. This was a great idea.</span>")
 		qdel(src)
 
-mob/living/simple_animal/hostile/bear/butter //The mighty companion to Cak. Several functions used from it.
+/mob/living/simple_animal/hostile/bear/butter //The mighty companion to Cak. Several functions used from it.
 	name = "Terrygold"
 	icon_state = "butterbear"
 	icon_living = "butterbear"
@@ -155,7 +155,7 @@ mob/living/simple_animal/hostile/bear/butter //The mighty companion to Cak. Seve
 		to_chat(src, "<span class='notice'>Your name is now <b>\"new_name\"</b>!</span>")
 		name = new_name
 
-mob/living/simple_animal/hostile/bear/butter/AttackingTarget() //Makes some attacks by the butter bear slip those who dare cross its path.
+/mob/living/simple_animal/hostile/bear/butter/AttackingTarget() //Makes some attacks by the butter bear slip those who dare cross its path.
 	if(isliving(target))
 		var/mob/living/L = target
 		if((L.mobility_flags & MOBILITY_STAND))

code/modules/mob/living/simple_animal/hostile/giant_spider.dm

@@ -389,7 +389,6 @@
 	name = "Wrap"
 	panel = "Spider"
 	active = FALSE
-	datum/action/spell_action/action = null
 	desc = "Wrap something or someone in a cocoon. If it's a living being, you'll also consume them, allowing you to lay eggs."
 	ranged_mousepointer = 'icons/effects/wrap_target.dmi'
 	action_icon = 'icons/mob/actions/actions_animal.dmi'

code/modules/mob/living/simple_animal/hostile/hostile.dm

@@ -511,7 +511,7 @@
 			DestroyObjectsInDirection(direction)
 
 
-mob/living/simple_animal/hostile/proc/DestroySurroundings() // for use with megafauna destroying everything around them
+/mob/living/simple_animal/hostile/proc/DestroySurroundings() // for use with megafauna destroying everything around them
 	if(environment_smash)
 		EscapeConfinement()
 		for(var/dir in GLOB.cardinals)

code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm

@@ -190,5 +190,5 @@
   * Arguments:
   * * datum/beam/vine - The vine to be removed from the list.
   */
-mob/living/simple_animal/hostile/venus_human_trap/proc/remove_vine(datum/beam/vine, force)
+/mob/living/simple_animal/hostile/venus_human_trap/proc/remove_vine(datum/beam/vine, force)
 	vines -= vine

code/modules/mob/living/simple_animal/parrot.dm

@@ -83,6 +83,8 @@
 
 	//Headset for Poly to yell at engineers :)
 	var/obj/item/radio/headset/ears = null
+	/// spawns with headset
+	var/spawns_with_headset = FALSE
 
 	//The thing the parrot is currently interested in. This gets used for items the parrot wants to pick up, mobs it wants to steal from,
 	//mobs it wants to attack or mobs that have attacked it
@@ -105,13 +107,14 @@
 
 /mob/living/simple_animal/parrot/Initialize()
 	. = ..()
-	if(!ears)
-		var/headset = pick(/obj/item/radio/headset/headset_sec, \
-						/obj/item/radio/headset/headset_eng, \
-						/obj/item/radio/headset/headset_med, \
-						/obj/item/radio/headset/headset_sci, \
-						/obj/item/radio/headset/headset_cargo)
-		ears = new headset(src)
+	if(spawns_with_headset)
+		if(!ears)
+			var/headset = pick(/obj/item/radio/headset/headset_sec, \
+							/obj/item/radio/headset/headset_eng, \
+							/obj/item/radio/headset/headset_med, \
+							/obj/item/radio/headset/headset_sci, \
+							/obj/item/radio/headset/headset_cargo)
+			ears = new headset(src)
 
 	parrot_sleep_dur = parrot_sleep_max //In case someone decides to change the max without changing the duration var
 
@@ -881,6 +884,7 @@
 	speak = list("Poly wanna cracker!", ":e Check the crystal, you chucklefucks!",":e Wire the solars, you lazy bums!",":e WHO TOOK THE DAMN HARDSUITS?",":e OH GOD ITS ABOUT TO DELAMINATE CALL THE SHUTTLE")
 	gold_core_spawnable = NO_SPAWN
 	speak_chance = 3
+	spawns_with_headset = TRUE
 	var/memory_saved = FALSE
 	var/rounds_survived = 0
 	var/longest_survival = 0

code/modules/mob/say_vr.dm

@@ -3,14 +3,14 @@
 //////////////////////////////////////////////////////
 
 /mob/proc/get_top_level_mob()
-	if(istype(src.loc,/mob)&&src.loc!=src)
-		var/mob/M=src.loc
+	if(ismob(src.loc) && src.loc != src)
+		var/mob/M = src.loc
 		return M.get_top_level_mob()
 	return src
 
-proc/get_top_level_mob(var/mob/S)
-	if(istype(S.loc,/mob)&&S.loc!=S)
-		var/mob/M=S.loc
+/proc/get_top_level_mob(mob/S)
+	if(ismob(S.loc) && S.loc != S)
+		var/mob/M = S.loc
 		return M.get_top_level_mob()
 	return S