Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

2019-08-15 08:39:41 -05:00
parent dcd682bd59 0125a20252
commit 2073921f4b
112 changed files with 692 additions and 547 deletions
@@ -230,6 +230,7 @@
 				B.prev_size = B.size
 			B.shape = dna.features["breasts_shape"]
 			B.fluid_id = dna.features["breasts_fluid"]
+			B.producing = dna.features["breasts_producing"]
 			B.update()


@@ -49,7 +49,7 @@

 /datum/outfit/lavaknight/captain
 	name ="Cydonian Knight Captain"
-	l_pocket = /obj/item/twohanded/hypereutactic
+	l_pocket = /obj/item/twohanded/dualsaber/hypereutactic

 /datum/outfit/lavaknight/captain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	if(visualsOnly)
@@ -220,7 +220,7 @@
 /datum/gear/torisword
 	name = "Rainbow Zweihander"
 	category = SLOT_IN_BACKPACK
-	path = /obj/item/twohanded/hypereutactic/toy/rainbow
+	path = /obj/item/twohanded/dualsaber/hypereutactic/toy/rainbow
 	ckeywhitelist = list("annoymous35")

 /datum/gear/darksabre
@@ -438,7 +438,13 @@ datum/gear/darksabresheath
 /datum/gear/borgplush
 	name = "Robot Plush"
 	category = SLOT_IN_BACKPACK
-	/obj/item/toy/plush/borgplushie
+	path = /obj/item/toy/plush/borgplushie
 	ckeywhitelist = list("nicholaiavenicci")

+/datum/gear/donorberet
+	name = "Atmos Beret"
+	category = SLOT_HEAD
+	path = /obj/item/clothing/head/blueberet
+	ckeywhitelist = list("foxystalin")
+

@@ -65,6 +65,7 @@
 	WRITE_FILE(S["feature_breasts_shape"], features["breasts_shape"])
 	WRITE_FILE(S["feature_breasts_color"], features["breasts_color"])
 	WRITE_FILE(S["feature_breasts_fluid"], features["breasts_fluid"])
+	WRITE_FILE(S["feature_breasts_producing"], features["breasts_producing"])
 	//vagina features
 	WRITE_FILE(S["feature_has_vag"], features["has_vag"])
 	WRITE_FILE(S["feature_vag_shape"], features["vag_shape"])
@@ -508,3 +508,11 @@
 	icon = 'icons/obj/custom.dmi'
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
 	mutantrace_variation = NO_MUTANTRACE_VARIATION
+
+/obj/item/clothing/head/blueberet
+	name = "Atmos Beret"
+	desc = "A fitted beret designed to be worn by Atmos Techs."
+	icon_state = "blueberet"
+	item_state = "blueberet"
+	icon = 'icons/obj/custom.dmi'
+	alternate_worn_icon = 'icons/mob/custom_w.dmi'
@@ -331,7 +331,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING

 		if(86)//mean clone time!
 			if (!M.reagents.has_reagent("pen_acid"))//Counterplay is pent.)
-				message_admins("(non-infectious) Zombie spawned at [M.loc], produced by impure chem, wah!")
+				message_admins("(non-infectious) SDZF: Zombie spawned at [M] [COORD(M)]!")
 				M.nutrition = startHunger - 500//YOU BEST BE RUNNING AWAY AFTER THIS YOU BADDIE
 				M.next_move_modifier = 1
 				to_chat(M, "<span class='warning'>Your body splits away from the cell clone of yourself, your attempted clone birthing itself violently from you as it begins to shamble around, a terrifying abomination of science.</span>")