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

Added happiness, psicodine, neurine and 2/6th of MC chem

Browse Source
This commit is contained in:
Fermi
2019-05-04 17:50:43 +01:00
parent bca578ab2c
commit b71bc7d9dc
8 changed files with 235 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/datums/status_effects/chems.dm
+11 -8
View File
@@ -150,21 +150,24 @@
///////////////////////////////////////////
*/
/datum/status_effect/chem/enthral
id = "enthral"
/datum/status_effect/chem/enthrall
id = "enthrall"
var/mob/living/E //E for enchanter
//var/mob/living/V = list() //V for victims
var/enthralTally = 10
var/enthrallTally = 10
var/resistanceTally = 0
var/phase = 0
var/deltaResist
var/deltaEnthrall
var/phase = 1 //1: initial, 2: 2nd stage - more commands, 3rd: fully enthralled
var/command
var/enthralID
/datum/status_effect/chem/enthra/on_apply(mob/living/carbon/M)
/datum/status_effect/chem/enthrall/on_apply(mob/living/carbon/M)
if(M.ID == )
/datum/status_effect/chem/enthral/tick(mob/living/carbon/M)
redirect_component = WEAKREF(owner.AddComponent(/datum/component/redirect, list(COMSIG_LIVING_RESIST = CALLBACK(src, .proc/owner_resist))))
/datum/status_effect/chem/enthrall/tick(mob/living/carbon/M)
redirect_component = WEAKREF(owner.AddComponent(/datum/component/redirect, list(COMSIG_LIVING_RESIST = CALLBACK(src, .proc/owner_resist)))) //Do resistance calc if resist is pressed
switch(phase)
if(0)
return
@@ -173,7 +176,7 @@
/datum/status_effect/chem/enthral/proc/owner_resist(mob/living/carbon/M)
/datum/status_effect/chem/enthrall/proc/owner_resist(mob/living/carbon/M)
to_chat(owner, "You attempt to shake the mental cobwebs from your mind!")
if (M.canbearoused)
resistance *= ((100 - M.arousalloss/100)/100)
modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+6 -6
View File
@@ -39,10 +39,10 @@
addiction_stage4_end = 43 //Incase it's too long
var/location_created
var/turf/open/location_return = null
var/addictCyc1 = 1
var/addictCyc2 = 1
var/addictCyc3 = 1
var/addictCyc4 = 1
var/addictCyc1 = 0
var/addictCyc2 = 0
var/addictCyc3 = 0
var/addictCyc4 = 0
var/mob/living/fermi_Tclone = null
var/teleBool = FALSE
mob/living/carbon/purgeBody
@@ -152,7 +152,7 @@
/datum/reagent/fermi/eigenstate/addiction_act_stage4(mob/living/M) //Thanks for riding Fermis' wild ride. Mild jitter and player buggery.
switch(src.addictCyc4)
if(1)
if(0)
do_sparks(5,FALSE,M)
do_teleport(M, get_turf(M), 2, no_effects=TRUE) //teleports clone so it's hard to find the real one!
do_sparks(5,FALSE,M)
@@ -172,7 +172,7 @@
src.addictCyc4++
..()
//. = 1
. = 1
///datum/reagent/fermi/eigenstate/overheat_explode(mob/living/M)
// return