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

2020-03-21 15:04:35 +01:00
parent e6f40cce14 9b05fb854c
commit 6c6b2a42eb
120 changed files with 152058 additions and 1702 deletions
@@ -208,12 +208,6 @@
 		give_genital(/obj/item/organ/genital/breasts)
 	if(dna.features["has_cock"])
 		give_genital(/obj/item/organ/genital/penis)
-	/*
-	if(dna.features["has_ovi"])
-		give_genital(/obj/item/organ/genital/ovipositor)
-	if(dna.features["has_eggsack"])
-		give_genital(/obj/item/organ/genital/eggsack)
-	*/

 /mob/living/carbon/human/proc/give_genital(obj/item/organ/genital/G)
 	if(!dna || (NOGENITALS in dna.species.species_traits) || getorganslot(initial(G.slot)))
@@ -137,14 +137,3 @@
 /datum/sprite_accessory/breasts/sextuple
 	icon_state = "sextuple"
 	name = "Sextuple"
-
-//OVIPOSITORS BE HERE
-/datum/sprite_accessory/ovipositor
-	icon = 'modular_citadel/icons/obj/genitals/penis_onmob.dmi'
-	icon_state = null
-	name = "Ovipositor"			//the preview name of the accessory
-	color_src = "cock_color"
-
-/datum/sprite_accessory/ovipositor/knotted
-	icon_state = "knotted"
-	name = "Knotted"
@@ -1,14 +0,0 @@
-/obj/item/organ/genital/eggsack
-	name = "Egg sack"
-	desc = "An egg producing reproductive organ."
-	icon_state = "egg_sack"
-	icon = 'modular_citadel/icons/obj/genitals/ovipositor.dmi'
-	zone = BODY_ZONE_PRECISE_GROIN
-	slot = ORGAN_SLOT_TESTICLES
-	genital_flags = GENITAL_INTERNAL|GENITAL_BLACKLISTED //unimplemented
-	linked_organ_slot = ORGAN_SLOT_PENIS
-	color = null //don't use the /genital color since it already is colored
-	var/egg_girth = EGG_GIRTH_DEF
-	var/cum_mult = CUM_RATE_MULT
-	var/cum_rate = CUM_RATE
-	var/cum_efficiency	= CUM_EFFICIENCY
@@ -1,16 +0,0 @@
-/obj/item/organ/genital/ovipositor
-	name = "Ovipositor"
-	desc = "An egg laying reproductive organ."
-	icon_state = "ovi_knotted_2"
-	icon = 'modular_citadel/icons/obj/genitals/ovipositor.dmi'
-	zone = BODY_ZONE_PRECISE_GROIN
-	slot = ORGAN_SLOT_PENIS
-	genital_flags = GENITAL_BLACKLISTED //unimplemented
-	shape = "knotted"
-	size = 3
-	layer_index = PENIS_LAYER_INDEX
-	var/length = 6								//inches
-	var/girth  = 0
-	var/girth_ratio = COCK_DIAMETER_RATIO_DEF 		//citadel_defines.dm for these defines
-	var/knot_girth_ratio = KNOT_GIRTH_RATIO_DEF
-	var/list/oviflags = list()
@@ -12,7 +12,6 @@
 	genital_flags = CAN_MASTURBATE_WITH|MASTURBATE_LINKED_ORGAN|GENITAL_FUID_PRODUCTION
 	var/size_name = "average"
 	shape = DEF_BALLS_SHAPE
-	var/sack_size = BALLS_SACK_SIZE_DEF
 	fluid_id = /datum/reagent/consumable/semen
 	masturbation_verb = "massage"
 	layer_index = TESTICLES_LAYER_INDEX
@@ -64,7 +63,6 @@
 		color = "#[skintone2hex(H.skin_tone)]"
 	else
 		color = "#[D.features["balls_color"]]"
-	sack_size = D.features["balls_sack_size"]
 	shape = D.features["balls_shape"]
 	if(D.features["balls_shape"] == "Hidden")
 		ENABLE_BITFIELD(genital_flags, GENITAL_INTERNAL)
@@ -50,13 +50,11 @@
 	WRITE_FILE(S["feature_cock_color"], features["cock_color"])
 	WRITE_FILE(S["feature_cock_length"], features["cock_length"])
 	WRITE_FILE(S["feature_cock_girth"], features["cock_girth"])
-	WRITE_FILE(S["feature_has_sheath"], features["sheath_color"])
 	//balls features
 	WRITE_FILE(S["feature_has_balls"], features["has_balls"])
 	WRITE_FILE(S["feature_balls_color"], features["balls_color"])
 	WRITE_FILE(S["feature_balls_size"], features["balls_size"])
 	WRITE_FILE(S["feature_balls_shape"], features["balls_shape"])
-	WRITE_FILE(S["feature_balls_sack_size"], features["balls_sack_size"])
 	//breasts features
 	WRITE_FILE(S["feature_has_breasts"], features["has_breasts"])
 	WRITE_FILE(S["feature_breasts_size"], features["breasts_size"])
@@ -192,6 +192,8 @@
 	stamina = 18
 	stutter = 5
 	jitter = 20
+	strong_tase = FALSE
+	tase_duration = 0
 	hitsound = 'sound/weapons/taserhit.ogg'
 	range = 3
 	strong_tase = FALSE