From eeab3ed11f1150f7bf3fbf1bc452c133270d481a Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Thu, 19 Mar 2020 17:34:01 +0100 Subject: [PATCH] Everyday --- code/__DEFINES/citadel_defines.dm | 14 ------- code/__HELPERS/_cit_helpers.dm | 12 ------ code/__HELPERS/mobs.dm | 14 ------- code/modules/client/preferences.dm | 37 +----------------- code/modules/client/preferences_savefile.dm | 1 - .../code/modules/arousal/genitals.dm | 6 --- .../arousal/genitals_sprite_accessories.dm | 11 ------ .../code/modules/arousal/organs/eggsack.dm | 14 ------- .../code/modules/arousal/organs/ovipositor.dm | 16 -------- .../modules/client/preferences_savefile.dm | 2 - .../icons/obj/genitals/ovipositor.dmi | Bin 775 -> 0 bytes 11 files changed, 1 insertion(+), 126 deletions(-) delete mode 100644 modular_citadel/code/modules/arousal/organs/eggsack.dm delete mode 100644 modular_citadel/code/modules/arousal/organs/ovipositor.dm delete mode 100644 modular_citadel/icons/obj/genitals/ovipositor.dmi diff --git a/code/__DEFINES/citadel_defines.dm b/code/__DEFINES/citadel_defines.dm index f1f0d45e90..b783d2c981 100644 --- a/code/__DEFINES/citadel_defines.dm +++ b/code/__DEFINES/citadel_defines.dm @@ -43,10 +43,6 @@ #define COCK_DIAMETER_RATIO_DEF 0.25 #define COCK_DIAMETER_RATIO_MIN 0.15 -#define KNOT_GIRTH_RATIO_MAX 3 -#define KNOT_GIRTH_RATIO_DEF 2.1 -#define KNOT_GIRTH_RATIO_MIN 1.25 - #define BALLS_VOLUME_BASE 25 #define BALLS_VOLUME_MULT 1 @@ -54,18 +50,10 @@ #define BALLS_SIZE_DEF 2 #define BALLS_SIZE_MAX 3 -#define BALLS_SACK_SIZE_MIN 1 -#define BALLS_SACK_SIZE_DEF 8 -#define BALLS_SACK_SIZE_MAX 40 - #define CUM_RATE 2 // holy shit what a really shitty define name - relates to units per arbitrary measure of time? #define CUM_RATE_MULT 1 #define CUM_EFFICIENCY 1 //amount of nutrition required per life() -#define EGG_GIRTH_MIN 1//inches -#define EGG_GIRTH_DEF 6 -#define EGG_GIRTH_MAX 16 - #define BREASTS_VOLUME_BASE 50 //base volume for the reagents in the breasts, multiplied by the size then multiplier. 50u for A cups, 850u for HH cups. #define BREASTS_VOLUME_MULT 1 //global multiplier for breast volume. @@ -83,8 +71,6 @@ //Citadel istypes #define isgenital(A) (istype(A, /obj/item/organ/genital)) -#define isborer(A) (istype(A, /mob/living/simple_animal/borer)) - #define CITADEL_MENTOR_OOC_COLOUR "#224724" //xenobio console upgrade stuff diff --git a/code/__HELPERS/_cit_helpers.dm b/code/__HELPERS/_cit_helpers.dm index ffc1bcc6b7..1954a159b3 100644 --- a/code/__HELPERS/_cit_helpers.dm +++ b/code/__HELPERS/_cit_helpers.dm @@ -139,18 +139,6 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE) return TRUE return FALSE -/mob/living/carbon/proc/has_ovipositor() - var/obj/item/organ/genital/G = getorganslot(ORGAN_SLOT_PENIS) - if(G && istype(G, /obj/item/organ/genital/ovipositor)) - return TRUE - return FALSE - -/mob/living/carbon/human/proc/has_eggsack() - var/obj/item/organ/genital/G = getorganslot(ORGAN_SLOT_TESTICLES) - if(G && istype(G, /obj/item/organ/genital/eggsack)) - return TRUE - return FALSE - /mob/living/carbon/proc/is_groin_exposed(list/L) if(!L) L = get_equipped_items() diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 7852ab9d06..511996276a 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -184,28 +184,14 @@ "cock_length" = 6, "cock_diameter_ratio" = COCK_DIAMETER_RATIO_DEF, "cock_color" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"), - "has_sheath" = FALSE, - "sheath_color" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"), "has_balls" = FALSE, "balls_internal" = FALSE, "balls_color" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"), - "balls_amount" = 2, - "balls_sack_size" = BALLS_SACK_SIZE_DEF, "balls_size" = BALLS_SIZE_DEF, "balls_shape" = "Single", "balls_cum_rate" = CUM_RATE, "balls_cum_mult" = CUM_RATE_MULT, "balls_efficiency" = CUM_EFFICIENCY, - "has_ovi" = FALSE, - "ovi_shape" = "knotted", - "ovi_length" = 6, - "ovi_color" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"), - "has_eggsack" = FALSE, - "eggsack_internal" = TRUE, - "eggsack_color" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"), - "eggsack_size" = BALLS_SACK_SIZE_DEF, - "eggsack_egg_color" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"), - "eggsack_egg_size" = EGG_GIRTH_DEF, "has_breasts" = FALSE, "breasts_color" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"), "breasts_size" = pick(GLOB.breasts_size_list), diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 17e9720590..d29945508f 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -125,28 +125,14 @@ GLOBAL_LIST_EMPTY(preferences_datums) "cock_length" = 6, "cock_diameter_ratio" = COCK_DIAMETER_RATIO_DEF, "cock_color" = "fff", - "has_sheath" = FALSE, - "sheath_color" = "fff", "has_balls" = FALSE, "balls_internal" = FALSE, "balls_color" = "fff", - "balls_amount" = 2, - "balls_sack_size" = BALLS_SACK_SIZE_DEF, "balls_shape" = "Single", "balls_size" = BALLS_SIZE_DEF, "balls_cum_rate" = CUM_RATE, "balls_cum_mult" = CUM_RATE_MULT, "balls_efficiency" = CUM_EFFICIENCY, - "has_ovi" = FALSE, - "ovi_shape" = "knotted", - "ovi_length" = 6, - "ovi_color" = "fff", - "has_eggsack" = FALSE, - "eggsack_internal" = TRUE, - "eggsack_color" = "fff", - "eggsack_size" = BALLS_SACK_SIZE_DEF, - "eggsack_egg_color" = "fff", - "eggsack_egg_size" = EGG_GIRTH_DEF, "has_breasts" = FALSE, "breasts_color" = "fff", "breasts_size" = "C", @@ -1924,6 +1910,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) new_dors = input(user, "Choose your character's dorsal tube type:", "Character Preference") as null|anything in GLOB.xeno_dorsal_list if(new_dors) features["xenodorsal"] = new_dors + //Genital code if("cock_color") var/new_cockcolor = input(user, "Penis color:", "Character Preference") as color|null @@ -1964,22 +1951,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(new_shape) features["balls_shape"] = new_shape - if("egg_size") - var/new_size - var/list/egg_sizes = list(1,2,3) - new_size = input(user, "Egg Diameter(inches):", "Egg Size") as null|anything in egg_sizes - if(new_size) - features["eggsack_egg_size"] = new_size - - if("egg_color") - var/new_egg_color = input(user, "Egg Color:", "Character Preference") as color|null - if(new_egg_color) - var/temp_hsv = RGBtoHSV(new_egg_color) - if(ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) - features["eggsack_egg_color"] = sanitize_hexcolor(new_egg_color) - else - to_chat(user,"Invalid color. Your color is not bright enough.") - if("breasts_size") var/new_size new_size = input(user, "Breast Size", "Character Preference") as null|anything in GLOB.breasts_size_list @@ -2113,14 +2084,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) features["has_balls"] = FALSE if("has_balls") features["has_balls"] = !features["has_balls"] - if("has_ovi") - features["has_ovi"] = !features["has_ovi"] - if("has_eggsack") - features["has_eggsack"] = !features["has_eggsack"] if("balls_internal") features["balls_internal"] = !features["balls_internal"] - if("eggsack_internal") - features["eggsack_internal"] = !features["eggsack_internal"] if("has_breasts") features["has_breasts"] = !features["has_breasts"] if(features["has_breasts"] == FALSE) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index d8b5edfa48..4c9733e97e 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -452,7 +452,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["feature_balls_color"] >> features["balls_color"] S["feature_balls_size"] >> features["balls_size"] S["feature_balls_shape"] >> features["balls_shape"] - S["feature_balls_sack_size"] >> features["balls_sack_size"] //breasts features S["feature_has_breasts"] >> features["has_breasts"] S["feature_breasts_size"] >> features["breasts_size"] diff --git a/modular_citadel/code/modules/arousal/genitals.dm b/modular_citadel/code/modules/arousal/genitals.dm index 7cf8fb8ff9..9aa4a26065 100644 --- a/modular_citadel/code/modules/arousal/genitals.dm +++ b/modular_citadel/code/modules/arousal/genitals.dm @@ -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))) diff --git a/modular_citadel/code/modules/arousal/genitals_sprite_accessories.dm b/modular_citadel/code/modules/arousal/genitals_sprite_accessories.dm index 594fc83e46..07453facdf 100644 --- a/modular_citadel/code/modules/arousal/genitals_sprite_accessories.dm +++ b/modular_citadel/code/modules/arousal/genitals_sprite_accessories.dm @@ -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" diff --git a/modular_citadel/code/modules/arousal/organs/eggsack.dm b/modular_citadel/code/modules/arousal/organs/eggsack.dm deleted file mode 100644 index ebdefd2371..0000000000 --- a/modular_citadel/code/modules/arousal/organs/eggsack.dm +++ /dev/null @@ -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 diff --git a/modular_citadel/code/modules/arousal/organs/ovipositor.dm b/modular_citadel/code/modules/arousal/organs/ovipositor.dm deleted file mode 100644 index 07a9e89746..0000000000 --- a/modular_citadel/code/modules/arousal/organs/ovipositor.dm +++ /dev/null @@ -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() diff --git a/modular_citadel/code/modules/client/preferences_savefile.dm b/modular_citadel/code/modules/client/preferences_savefile.dm index 334f301dca..80e20c9f48 100644 --- a/modular_citadel/code/modules/client/preferences_savefile.dm +++ b/modular_citadel/code/modules/client/preferences_savefile.dm @@ -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"]) diff --git a/modular_citadel/icons/obj/genitals/ovipositor.dmi b/modular_citadel/icons/obj/genitals/ovipositor.dmi deleted file mode 100644 index 81d857417fbad922796305fb5790d72247f5efa0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 775 zcmV+i1Ni)jP) zv$KMNg7ozC-{0S;sHoT1*MTl9`mUV$n~0P{Mc{>S$7xl-z`#VnT_6Ae00DGTPE!Ct z=GbNc005PGR9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM z;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+zbrF8J1@VaBsC@8P>G8(C9|j)C~nBb znO2mTn+joLRc%C)YGZ<`Q`6In6O*&!lX4RCvWZqr*v&ANgxw2MiPNph3a)-G;9v#- zhBj)_^#^ov0005%Nkl_0G z5SQY59{|>+*Tj7&7mercpe&PUV$A)a`Gy_l{{tBS4ssNoF&pA@pHJukT8MA_ffr;V zEktwDaGAhpA-Y<4e0oh9Xn}IPBn`Acm^vIv zGAN~5+1^jj(DtE`kwIx`QK8%``KDwsh&*MntuXnZUliT{Ar1C_uz~y!0vhc9kk(I%