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

Fixed acid to water and funbits.

Browse Source
This commit is contained in:
Fermi
2019-05-24 01:50:33 +01:00
parent 645dfca14a
commit b1c11071de
9 changed files with 72 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/arousal/organs/genitals.dm
+16 -6
View File
@@ -130,7 +130,7 @@
//proc to give a player their genitals and stuff when they log in
/mob/living/carbon/human/proc/give_genitals(clean=0)//clean will remove all pre-existing genitals. proc will then give them any genitals that are enabled in their DNA
if ((NOGENITALS in dna.species.species_traits) && (genital_override = FALSE))
if (NOGENITALS in dna.species.species_traits)
return
if(clean)
var/obj/item/organ/genital/GtoClean
@@ -155,7 +155,7 @@
/mob/living/carbon/human/proc/give_penis()
if(!dna)
return FALSE
if((NOGENITALS in dna.species.species_traits) && (genital_override = FALSE))
if(NOGENITALS in dna.species.species_traits)
return FALSE
if(!getorganslot("penis"))
var/obj/item/organ/genital/penis/P = new
@@ -173,7 +173,7 @@
/mob/living/carbon/human/proc/give_balls()
if(!dna)
return FALSE
if((NOGENITALS in dna.species.species_traits) && (genital_override = FALSE))
if(NOGENITALS in dna.species.species_traits)
return FALSE
if(!getorganslot("testicles"))
var/obj/item/organ/genital/testicles/T = new
@@ -194,7 +194,7 @@
/mob/living/carbon/human/proc/give_breasts()
if(!dna)
return FALSE
if((NOGENITALS in dna.species.species_traits) && (genital_override = FALSE))
if(NOGENITALS in dna.species.species_traits)
return FALSE
if(!getorganslot("breasts"))
var/obj/item/organ/genital/breasts/B = new
@@ -217,7 +217,7 @@
/mob/living/carbon/human/proc/give_vagina()
if(!dna)
return FALSE
if((NOGENITALS in dna.species.species_traits) && (genital_override = FALSE))
if(NOGENITALS in dna.species.species_traits)
return FALSE
if(!getorganslot("vagina"))
var/obj/item/organ/genital/vagina/V = new
@@ -233,7 +233,7 @@
/mob/living/carbon/human/proc/give_womb()
if(!dna)
return FALSE
if((NOGENITALS in dna.species.species_traits) && (genital_override = FALSE))
if(NOGENITALS in dna.species.species_traits)
return FALSE
if(!getorganslot("womb"))
var/obj/item/organ/genital/womb/W = new
@@ -269,12 +269,22 @@
if(src && !QDELETED(src))
dna.species.handle_genitals(src)
//fermichem procs
/mob/living/carbon/human/proc/Force_update_genitals(mob/living/carbon/human/H) //called in fermiChem
dna.species.handle_genitals(src)
//dna.species.handle_breasts(src)
//H.update_body()
//species_traits = list(NOTRANSSTING,NOGENITALS)
/mob/living/carbon/human/proc/emergent_genital_call()
var/organCheck = FALSE
for(var/obj/item/organ/O in internal_organs)
if(istype(O, /obj/item/organ/genital))
organCheck = TRUE
if (organCheck == FALSE)
dna.features["genitals_use_skintone"] = TRUE
dna.species.use_skintones = TRUE
return
/datum/species/proc/handle_genitals(mob/living/carbon/human/H)
//message_admins("attempting to update sprite")
modular_citadel/code/modules/arousal/organs/penis.dm
+3 -3
View File
@@ -64,14 +64,14 @@
//message_admins("Pinas size: [length], [cached_length], [o]")
//message_admins("2. size vs prev_size")
if (round(length) > round(prev_size))
to_chat(o, "<span class='warning'>Your [pick("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ", "cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "weenie", "tadger", "schlong", "thirsty ferret", "baloney pony", "schlanger")] [pick("swells up to", "flourishes into", "expands into", "bursts forth into", "grows eagerly into", "amplifys into")] a [uppertext(length)] inch penis.</b></span>")
to_chat(o, "<span class='warning'>Your [pick("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ", "cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "Chase Redtail", "weenie", "tadger", "schlong", "thirsty ferret", "baloney pony", "schlanger")] [pick("swells up to", "flourishes into", "expands into", "bursts forth into", "grows eagerly into", "amplifys into")] a [uppertext(length)] inch penis.</b></span>")
else if (round(length) < round(prev_size))
to_chat(o, "<span class='warning'>Your [pick("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ", "cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "weenie", "tadger", "schlong", "thirsty ferret", "baloney pony", "schlanger")] [pick("shrinks down to", "decreases into", "diminishes into", "deflates into", "shrivels regretfully into", "contracts into")] a [uppertext(length)] inch penis.</b></span>")
to_chat(o, "<span class='warning'>Your [pick("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ", "cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "Chase Redtail", "weenie", "tadger", "schlong", "thirsty ferret", "baloney pony", "schlanger")] [pick("shrinks down to", "decreases into", "diminishes into", "deflates into", "shrivels regretfully into", "contracts into")] a [uppertext(length)] inch penis.</b></span>")
prev_size = length
icon_state = sanitize_text("penis_[shape]_[size]")
//update_body()
//P.update_icon() //Either of these don't work, why???
girth = (length * girth_ratio)
girth = (length * girth_ratio)//Is it just me or is this ludicous, why not make it exponentially decay?
//var/mob/living/carbon/human/H = owner
//H.update_genitals()
//owner.update_genitals()
modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+4 -2
View File
@@ -631,6 +631,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
H.genital_override = TRUE
var/obj/item/organ/genital/breasts/B = H.getorganslot("breasts")
if(!B)
H.emergent_genital_call()
message_admins("No breasts found on init!")
return
var/sizeConv = list("a" = 1, "b" = 2, "c" = 3, "d" = 4, "e" = 5)
@@ -735,13 +736,14 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
InverseChem = "PEsmaller" //At really impure vols, it just becomes 100% inverse
//var/mob/living/carbon/human/H
/datum/reagent/fermi/BElarger/on_mob_add(mob/living/carbon/M)
/datum/reagent/fermi/PElarger/on_mob_add(mob/living/carbon/M)
. = ..()
var/mob/living/carbon/human/H = M
H.genital_override = TRUE
var/obj/item/organ/genital/penis/P = H.getorganslot("penis")
if(!P)
message_admins("No penis found on init!")
H.emergent_genital_call()
return
P.prev_size = P.length
P.cached_length = P.length
@@ -785,7 +787,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
if(B)
B.cached_size = B.cached_size - 0.1
message_admins("Breast size: [B.size], [B.cached_size], [holder]")
//message_admins("Breast size: [B.size], [B.cached_size], [holder]")
B.update()
if(V)
V.Remove(M)
modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
+6 -4
View File
@@ -135,9 +135,9 @@
/datum/chemical_reaction/fermi/BElarger //done
name = "Sucubus milk"
id = "BElarger"
results = list("BElarger" = 6)
results = list("BElarger" = 0.6)
required_reagents = list("salglu_solution" = 0.1, "milk" = 0.5, "synthflesh" = 0.2, "silicon" = 0.2, "aphro" = 0.2)
mix_message = "the reaction gives off a sent of milkshakes!"
mix_message = "the reaction gives off a mist of milk."
//FermiChem vars:
OptimalTempMin = 200
OptimalTempMax = 800
@@ -169,6 +169,7 @@
id = "PElarger"
results = list("PElarger" = 0.3)
required_reagents = list("plasma" = 0.1, "stable_plasma" = 0.1, "sugar" = 0.1)
mix_message = ""
//required_reagents = list("stable_plasma" = 5, "slimejelly" = 5, "synthflesh" = 10, "blood" = 10)
//FermiChem vars:
OptimalTempMin = 200
@@ -226,6 +227,7 @@
required_reagents = list("iron" = 0.1, "iodine" = 0.1)
//required_reagents = list("cocoa" = 1, "astral" = 1, "mindbreaker" = 1, "psicodine" = 1, "happiness" = 1)
required_catalysts = list("blood" = 0.1)
mix_message = "the reaction gives off a burgundy plume of smoke!"
//required_reagents = list("stable_plasma" = 5, "slimejelly" = 5, "synthflesh" = 10, "blood" = 10)
//FermiChem vars:
OptimalTempMin = 780
@@ -265,7 +267,7 @@
E.creatorName = B.data.["real_name"]
E.data.["creatorID"] = B.data.["ckey"]
E.creatorID = B.data.["ckey"]
message_admins("name: [E.creatorName], ID: [E.creatorID], gender: [E.creatorGender]")
message_admins("MKUltra made name: [E.creatorName], ID: [E.creatorID], gender: [E.creatorGender]")
//Apprently works..?Negative
/*
@@ -293,7 +295,7 @@
s.set_up(R, volume, T)
s.start()
my_atom.reagents.clear_reagents()
//..() //Please don't kill everyone too.
..(volume = 0, pH = 7, purity = 1) //Just a lil fire.
/datum/chemical_reaction/fermi/hatmium // done
name = "Hat growth serum"