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

Should be most compiling errors fixed outside of outdated merge problems

Browse Source
This commit is contained in:
Fermi
2019-05-11 14:04:43 +01:00
parent 6466ef562c
commit 6a17d66323
4 changed files with 88 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+16 -9
View File
@@ -515,7 +515,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
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]]
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]]")
/datum/reagent/fermi/BElarger/on_mob_life(mob/living/carbon/M) //Increases breast size
@@ -748,39 +748,46 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
overdose_threshold = 100 //If this is too easy to get 100u of this, then double it please.
//addiction_threshold = 30
//addiction_stage1_end = 9999//Should never end.
var/creatorID //add here
var/creatorID //ckey
var/creatorGender
var/creatorName
var/mob/living/creator
/datum/reagent/fermi/enthrall/on_mob_add(mob/living/carbon/M)
..()
if(!creatorID)
CRASH("Something went wrong in enthral creation")
else if(M.ID == creatorID)
else if(M.key == creatorID && creatorName == M.real_name) //same name AND same player - same instance of the player. (should work for clones?)
var/obj/item/organ/vocal_cords/Vc = M.getorganslot(ORGAN_SLOT_VOICE)
var/obj/item/organ/vocal_cords/nVc = new /obj/item/organ/vocal_cords/velvet
Vc.Remove(M)
nVc.Insert(M)
qdel(Vc)
to_chat(M, "<span class='notice'><i>You feel your vocal chords tingle as your voice becomes more sultry.</span>")
to_chat(M, "<span class='notice'><i>You feel your vocal chords tingle as your voice comes out in a more sultry tone.</span>")
creator = M
else
M.apply_status_effect(/datum/status_effect/chem/enthrall)
var/datum/status_effect/chem/enthral/E = M.has_status_effect(/datum/status_effect/chem/enthrall)
var/datum/status_effect/chem/enthrall/E = M.has_status_effect(/datum/status_effect/chem/enthrall)
E.enthrallID = creatorID
E.enthrallGender = creatorGender
E.master = creator
/datum/reagent/fermi/enthrall/on_mob_life(mob/living/carbon/M)
var/datum/status_effect/chem/enthral/E = M.has_status_effect(/datum/status_effect/chem/enthrall)
var/datum/status_effect/chem/enthrall/E = M.has_status_effect(/datum/status_effect/chem/enthrall)
E.enthrallTally += 1
M.adjustBrainLoss(0.1)
..()
/datum/reagent/fermi/enthrall/overdose_start(mob/living/carbon/M)
M.add_trait(TRAIT_PACIFISM, "MKUltra")
var/datum/status_effect/chem/enthrall/E = M.has_status_effect(/datum/status_effect/chem/enthrall)
if (!M.has_status_effect(/datum/status_effect/chem/enthrall))
M.apply_status_effect(/datum/status_effect/chem/enthrall)
var/datum/status_effect/chem/enthral/E = M.has_status_effect(/datum/status_effect/chem/enthrall)
E.enthrallID = creatorID
to_chat(M, "<span class='warning'><i>Your mind shatters under the volume of the mild altering chem inside of you, breaking all will and thought completely. Instead the only force driving you now is the instinctual desire to obey and follow [enthrallID.name].</i></span>")
E.enthrallID = creatorID
E.enthrallGender = creatorGender
E.master = creator
to_chat(M, "<span class='warning'><i>Your mind shatters under the volume of the mild altering chem inside of you, breaking all will and thought completely. Instead the only force driving you now is the instinctual desire to obey and follow [creatorName].</i></span>")
M.slurring = 100
M.confused = 100
E.phase = 4
modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
+8 -3
View File
@@ -127,7 +127,12 @@
/datum/chemical_reaction/enthral/on_reaction(datum/reagents/holder)
var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
var/datum/reagent/fermi/enthrall/E = locate(/datum/reagent/fermi/enthrall) in holder.reagent_list
E.creatorGender = B.["gender"]
if (B.["gender"] == "female")
E.creatorGender = "Mistress"
else
E.creatorGender = "Master"
E.creatorName = B.["real_name"]
var/enthrallID = B.get_blood_data()
E.creatorID = enthrallID
E.creatorID = B.["ckey"]
var/mob/living/creator = holder
E.creator = creator
//var/enthrallID = B.get_blood_data()