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

Why did I fiddle with things I shouldn't have.

Browse Source
This commit is contained in:
Fermi
2019-05-29 03:16:11 +01:00
parent 91cfd8e052
commit 01a38479fa
4 changed files with 18 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/arousal/organs/genitals.dm
+2 -6
View File
@@ -295,18 +295,14 @@
//Checks to see if organs are new on the mob, and changes their colours so that they don't get crazy colours.
/mob/living/carbon/human/proc/emergent_genital_call()
if((dna.features["has_breasts"]) && (dna.features["has_breasts"]))
return
var/organCheck = FALSE
for(var/obj/item/organ/O in internal_organs)
if(istype(O, /obj/item/organ/genital))
organCheck = TRUE
if(/obj/item/organ/genital/penis)
if(!dna.features["has_cock"])
dna.features["has_cock"] = TRUE
dna.features["has_cock"] = TRUE
if(/obj/item/organ/genital/breasts)
if(!dna.features["has_breasts"])
dna.features["has_breasts"] = TRUE//Goddamnit get in there.
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
modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+2 -3
View File
@@ -666,6 +666,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
H.genital_override = TRUE
var/obj/item/organ/genital/penis/P = M.getorganslot("penis")
if(!P)
H.emergent_genital_call()
return
P.prev_size = P.length
P.cached_length = P.length
@@ -678,7 +679,6 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
if(!P)//They do have a preponderance for escapism, or so I've heard.
var/obj/item/organ/genital/penis/nP = new
nP.Insert(M)
H.emergent_genital_call()
if(nP)
nP.length = 1
to_chat(M, "<span class='warning'>Your groin feels warm, as you feel a newly forming bulge down below.</b></span>")
@@ -768,7 +768,6 @@ Buginess level: works as intended - except teleport makes sparks for some reason
InverseChemVal = 0.25
/datum/reagent/fermi/astral/on_mob_life(mob/living/M) // Gives you the ability to astral project for a moment!
resetAddiction = TRUE
switch(current_cycle)
if(0)//Require a minimum
origin = M
@@ -806,7 +805,7 @@ Buginess level: works as intended - except teleport makes sparks for some reason
//Okay so, this might seem a bit too good, but my counterargument is that it'll likely take all round to eventually kill you this way, then you have to be revived without a body. It takes approximately 60-80 minutes to die from this.
/datum/reagent/fermi/astral/addiction_act_stage1(mob/living/carbon/M)
if(addiction_stage < 0)
if(addiction_stage < 2)
antiGenetics = 255//Doesn't reset when you take more, which is weird for me, it should.
M.alpha = 255 //Antigenetics is to do with stopping geneticists from turning people invisible to kill them.
if(prob(65))