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

Could this be the final commit?!

Browse Source
This commit is contained in:
Fermi
2019-05-25 16:12:46 +01:00
parent 4b8cb81752
commit e3d3f30ea9
10 changed files with 103 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/arousal/organs/genitals.dm
+7 -2
View File
@@ -284,8 +284,13 @@
if(istype(O, /obj/item/organ/genital))
organCheck = TRUE
if (organCheck == FALSE)
dna.features["genitals_use_skintone"] = TRUE
dna.species.use_skintones = TRUE
if(ishuman(src))
dna.features["genitals_use_skintone"] = TRUE
dna.species.use_skintones = TRUE
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"]]"
return
/datum/species/proc/handle_genitals(mob/living/carbon/human/H)
modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+31 -1
View File
@@ -630,6 +630,20 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
/datum/reagent/fermi/BElarger/on_mob_add(mob/living/carbon/M)
. = ..()
if(!ishuman(M)) //The monkey clause
if(volume >= 10)
var/turf/T = get_turf(M)
var/obj/item/organ/genital/breasts/B = new /obj/item/organ/genital/breasts(T)
var/list/seen = viewers(8, T)
for(var/mob/S in seen)
to_chat(S, "<span class='warning'>A pair of breasts suddenly fly out of the [M]!</b></span>")
//var/turf/T2 = pick(turf in view(5, M))
var/T2 = get_random_station_turf()
M.adjustBruteLoss(5)
M.Knockdown(50)
B.throw_at(T2, 8, 1)
M.reagents.remove_reagent(src.id, 1000)
return
var/mob/living/carbon/human/H = M
H.genital_override = TRUE
var/obj/item/organ/genital/breasts/B = H.getorganslot("breasts")
@@ -637,13 +651,14 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
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)
B.prev_size = B.size
B.cached_size = sizeConv[B.size]
message_admins("init B size: [B.size], prev: [B.prev_size], cache = [B.cached_size], raw: [sizeConv[B.size]]") //if this runtimes it's cause someone's breasts are too big!
/datum/reagent/fermi/BElarger/on_mob_life(mob/living/carbon/M) //Increases breast size
if(!ishuman(M))//Just in case
return
var/mob/living/carbon/human/H = M
var/obj/item/organ/genital/breasts/B = M.getorganslot("breasts")
if(!B) //If they don't have breasts, give them breasts.
@@ -742,6 +757,19 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
/datum/reagent/fermi/PElarger/on_mob_add(mob/living/carbon/M)
. = ..()
if(!ishuman(M)) //Just monkeying around.
if(volume >= 10)
var/turf/T = get_turf(M)
var/obj/item/organ/genital/penis/P = new /obj/item/organ/genital/penis(T)
var/list/seen = viewers(8, T)
for(var/mob/S in seen)
to_chat(S, "<span class='warning'>A penis suddenly flies out of the [M]!</b></span>")
var/T2 = get_random_station_turf()
M.adjustBruteLoss(5)
M.Knockdown(50)
P.throw_at(T2, 8, 1)
M.reagents.remove_reagent(src.id, 1000)
return
var/mob/living/carbon/human/H = M
H.genital_override = TRUE
var/obj/item/organ/genital/penis/P = M.getorganslot("penis")
@@ -754,6 +782,8 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
message_admins("init P len chem: [P.length], prev: [P.prev_size], cache = [P.cached_length]")
/datum/reagent/fermi/PElarger/on_mob_life(mob/living/carbon/M) //Increases penis size, 5u = +1 inch.
if(!ishuman(M))
return
var/mob/living/carbon/human/H = M
var/obj/item/organ/genital/penis/P = M.getorganslot("penis")
if(!P)
modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
+10 -10
View File
@@ -85,7 +85,7 @@
CurveSharppH = 2 // How sharp the pH exponential curve is (to the power of value)
ThermicConstant = 5 //Temperature change per 1u produced
HIonRelease = -0.1 //pH change per 1u reaction
RateUpLim = 5.5 //Optimal/max rate possible if all conditions are perfect
RateUpLim = 55 //Optimal/max rate possible if all conditions are perfect (NEEDS TO BE A MULTIPLE OF 10 IF RESULTS IS DOWN BY A FACTOR OF 10)
FermiChem = TRUE//If the chemical uses the Fermichem reaction mechanics
FermiExplode = FALSE //If the chemical explodes in a special way
@@ -115,7 +115,7 @@
CurveSharppH = 4 // How sharp the pH exponential curve is (to the power of value)
ThermicConstant = -5 // Temperature change per 1u produced
HIonRelease = 0.05 // pH change per 1u reaction
RateUpLim = 5 // Optimal/max rate possible if all conditions are perfect
RateUpLim = 20 // Optimal/max rate possible if all conditions are perfect
FermiChem = TRUE // If the chemical uses the Fermichem reaction mechanics
FermiExplode = TRUE // If the chemical explodes in a special way
PurityMin = 0.25
@@ -151,7 +151,7 @@
CurveSharppH = 2
ThermicConstant = 1
HIonRelease = 0.5
RateUpLim = 5
RateUpLim = 50
FermiChem = TRUE
FermiExplode = TRUE
PurityMin = 0.1
@@ -183,7 +183,7 @@
CurveSharppH = 2
ThermicConstant = 1
HIonRelease = -0.5
RateUpLim = 5
RateUpLim = 50
FermiChem = TRUE
FermiExplode = TRUE
PurityMin = 0.1
@@ -215,7 +215,7 @@
CurveSharppH = 1
ThermicConstant = 20
HIonRelease = -0.5
RateUpLim = 10
RateUpLim = 20
FermiChem = TRUE
FermiExplode = TRUE
PurityMin = 0.25 // explode purity!
@@ -297,7 +297,7 @@
CurveSharppH = 0.5
ThermicConstant = -2
HIonRelease = -0.05
RateUpLim = 5
RateUpLim = 50
FermiChem = TRUE
FermiExplode = TRUE
PurityMin = 0.5
@@ -328,7 +328,7 @@
CurveSharppH = 0.5
ThermicConstant = -10
HIonRelease = -0.1
RateUpLim = 10
RateUpLim = 20
FermiChem = TRUE
PurityMin = 0.30
@@ -352,7 +352,7 @@
CurveSharppH = 1
ThermicConstant = 5
HIonRelease = 0.01
RateUpLim = 100
RateUpLim = 200
FermiChem = TRUE
PurityMin = 0.15
@@ -373,7 +373,7 @@
CurveSharppH = 0
ThermicConstant = 0
HIonRelease = -0.01
RateUpLim = 20
RateUpLim = 200
FermiChem = TRUE
/datum/chemical_reaction/fermi/fermiABuffer/FermiFinish(datum/reagents/holder, var/atom/my_atom) //might need this
@@ -398,7 +398,7 @@
CurveSharppH = 0
ThermicConstant = 0
HIonRelease = 0.01
RateUpLim = 20
RateUpLim = 200
FermiChem = TRUE
/datum/chemical_reaction/fermi/fermiBBuffer/FermiFinish(datum/reagents/holder, var/atom/my_atom) //might need this