Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit

2020-01-20 17:53:06 -07:00
parent 90dd0909b8 ad2db72b0d
commit 12c832b40b
557 changed files with 7710 additions and 4481 deletions
@@ -1,7 +1,7 @@
 /datum/gear/greytidestationwide
-	name = "Grey jumpsuit"
+	name = "Staff Assistant's jumpsuit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/color/grey
+	path = /obj/item/clothing/under/staffassistant
 	restricted_roles = list("Assistant")

 /datum/gear/neetsuit
@@ -93,6 +93,7 @@
 	restricted_desc = "Engineering, Security, and Cargo"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")

+/*Commenting out Until next Christmas or made automatic
 /datum/gear/santahatr
 	name = "Red Santa Hat"
 	category = SLOT_HEAD
@@ -102,6 +103,7 @@
 	name = "Green Santa Hat"
 	category = SLOT_HEAD
 	path = /obj/item/clothing/head/christmashatg
+*/

 /datum/gear/cowboyhat
 	name = "Cowboy Hat, Brown"
@@ -129,6 +131,3 @@
 	path = /obj/item/clothing/head/cowboyhat/sec
 	restricted_desc = "Security"
 	restricted_roles = list("Warden","Detective","Security Officer","Head of Security")
-
-
-
@@ -390,6 +390,7 @@
 	path = /obj/item/clothing/under/gear_harness

 //Christmas
+/*Commenting out Until next Christmas or made automatic
 /datum/gear/christmasmaler
 	name = "Red Masculine Christmas Suit"
 	category = SLOT_W_UNIFORM
@@ -415,6 +416,7 @@
 	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/stripper_pink
 	cost = 3
+*/

 /datum/gear/greenstripper
 	name = "Green stripper outfit"
@@ -49,10 +49,9 @@
 			if(L[slot_to_string(slot)] < DEFAULT_SLOT_AMT)
 				return TRUE

-datum/preferences/copy_to(mob/living/carbon/human/character, icon_updates = 1)
+/datum/preferences/copy_to(mob/living/carbon/human/character, icon_updates = 1)
 	..()
 	character.give_genitals(TRUE)
 	character.flavor_text = features["flavor_text"] //Let's update their flavor_text at least initially
-	character.canbearoused = arousable
 	if(icon_updates)
 		character.update_genitals()