shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Final fixes, finally fixed all problems.

Browse Source
This commit is contained in:
Fermi
2019-05-29 01:33:07 +01:00
parent 12eb5e9b17
commit 543dc9a399
5 changed files with 49 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/arousal/organs/breasts.dm
+4 -5
View File
@@ -6,8 +6,8 @@
zone = "chest"
slot = "breasts"
w_class = 3
size = "c" //SHOULD BE A LETTER, starts as a number...???
var/cached_size = BREASTS_SIZE_DEF //for enlargement SHOULD BE A NUMBER
size = BREASTS_SIZE_DEF //SHOULD BE A LETTER, starts as a number...???
var/cached_size = null //for enlargement SHOULD BE A NUMBER
var/prev_size //For flavour texts SHOULD BE A LETTER
var/breast_sizes = list ("a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "huge", "flat")
var/breast_values = list ("a" = 1, "b" = 2, "c" = 3, "d" = 4, "e" = 5, "f" = 6, "g" = 7, "h" = 8, "i" = 9, "j" = 10, "k" = 11, "l" = 12, "m" = 13, "n" = 14, "o" = 15, "huge" = 16, "flat" = 0)
@@ -78,15 +78,14 @@
//Allows breasts to grow and change size, with sprite changes too.
//maximum wah
//Comical sizes slow you down in movement and actions.
//Rediculous sizes makes you more cumberson.
//Should I turn someone with meter wide... assets into a blob?
//Rediculous sizes makes you more cumbersome.
//this is far too lewd wah
/obj/item/organ/genital/breasts/update_size()//wah
if(!ishuman(owner) || !owner)
return
if(cached_size < 0)//I don't actually know what round() does to negative numbers, so to be safe!!(Why does this runtime??) - fixed
if(cached_size < 0)//I don't actually know what round() does to negative numbers, so to be safe!!fixed
to_chat(owner, "<span class='warning'>You feel your breasts shrinking away from your body as your chest flattens out.</b></span>")
src.Remove(owner)
switch(round(cached_size))
modular_citadel/code/modules/arousal/organs/genitals.dm
+20 -15
View File
@@ -1,6 +1,6 @@
/obj/item/organ/genital
color = "#fcccb3"
var/shape = "human"
var/shape = "Human" //Changed to be uppercase, let me know if this breaks everything..!!
var/sensitivity = 1
var/list/genital_flags = list()
var/can_masturbate_with = FALSE
@@ -210,13 +210,20 @@
else
B.color = "#[dna.features["breasts_color"]]"
B.size = dna.features["breasts_size"]
B.prev_size = B.size
message_admins("B.size[B.size]")
if (!B.size == "huge")
if(isnum(B.size))
B.cached_size = B.size
if(!isnum(B.size))
if(B.size == "flat")
B.cached_size = 0
B.prev_size = 0
else if (B.cached_size == "huge")
B.prev_size = "huge"
message_admins("I hate genitals, this should not appear. I'm so mad.")
else
B.cached_size = B.breast_values[B.size]
B.prev_size = B.size
else
B.cached_size = B.size
B.prev_size = B.size
message_admins("B.size [B.size], Cache [B.cached_size], prev [B.prev_size]")
B.shape = dna.features["breasts_shape"]
B.fluid_id = dna.features["breasts_fluid"]
B.update()
@@ -293,23 +300,21 @@
if(istype(O, /obj/item/organ/genital))
organCheck = TRUE
if(/obj/item/organ/genital/penis)
if(!dna.features["has_cock"] == 1)
dna.features["has_cock"] = 1//Goddamnit get in there.
dna.features["has_cock"] = TRUE
if(/obj/item/organ/genital/breasts)
dna.features["has_breasts"] = TRUE//Goddamnit get in there.
if (organCheck == FALSE)
if(ishuman(src) && dna.species.id == "human")
dna.features["genitals_use_skintone"] = TRUE
dna.species.use_skintones = TRUE
/* I can't get this to work.
if(MUTCOLORS)
if(src.dna.species.fixed_mut_color)
dna.features["cock_color"] = "#[src.dna.species.fixed_mut_color]"
dna.features["breasts_color"] = "#[src.dna.species.fixed_mut_color]"
dna.features["cock_color"] = "[src.dna.species.fixed_mut_color]"
dna.features["breasts_color"] = "[src.dna.species.fixed_mut_color]"
return
//So people who haven't set stuff up don't get rainbow surprises.
dna.features["cock_color"] = "#[dna.features["mcolor"]]"
dna.features["breasts_color"] = "#[dna.features["mcolor"]]"
*/
dna.features["cock_color"] = "[dna.features["mcolor"]]"
dna.features["breasts_color"] = "[dna.features["mcolor"]]"
return
/datum/species/proc/handle_genitals(mob/living/carbon/human/H)//more like handle sadness