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

Fixed compile errors.

Browse Source
This commit is contained in:
Fermi
2019-06-13 03:05:34 +01:00
parent 981c1644c9
commit eab52a51e6
6 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/datums/status_effects/chems.dm
+4 -3
View File
@@ -219,9 +219,10 @@
RegisterSignal(owner, COMSIG_MOVABLE_HEAR, .proc/owner_hear)
var/obj/item/organ/brain/B = M.getorganslot(ORGAN_SLOT_BRAIN) //It's their brain!
mental_capacity = 500 - B.get_brain_damage()
if(M.ishuman)//Prefs
if(!M.canbearoused)
var/lewd = FALSE
var/mob/living/carbon/human/H = owner
if(H)//Prefs
if(!H.canbearoused)
H.lewd = FALSE
var/message = "[(owner.lewd?"I am a good pet for [enthrallGender].":"[master] is a really inspirational person!")]"
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "enthrall", /datum/mood_event/enthrall, message)
to_chat(owner, "<span class='[(owner.lewd?"big love":"big warning")]'><b>You feel inexplicably drawn towards [master], their words having a demonstrable effect on you. It seems the closer you are to them, the stronger the effect is. However you aren't fully swayed yet and can resist their effects by repeatedly resisting as much as you can!</b></span>")
modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+3 -3
View File
@@ -1058,13 +1058,13 @@ Creating a chem with a low purity will make you permanently fall in love with so
if(!creatorID)
//This happens when the reaction explodes.
return
var/datum/status_effect/chem/enthrall/E = M.has_status_effect(/datum/status_effect/chem/enthrall) //Somehow a beaker got here? (what)
var/datum/status_effect/chem/enthrall/E = M.has_status_effect(/datum/status_effect/chem/enthrall)
if(E)
if(E.creatorID == M.ckey && creatorName != M.real_name)//If you're enthralled to yourself (from OD) and someone else tries to enthrall you, you become thralled to them instantly.
if(E.enthrallID == M.ckey && creatorName != M.real_name)//If you're enthralled to yourself (from OD) and someone else tries to enthrall you, you become thralled to them instantly.
E.enthrallID = creatorID
E.enthrallGender = creatorGender
E.master = get_mob_by_key(creatorID)
to_chat(M, to_chat(M, "<span class='big love'><i>Your aldled, plastic, mind bends under the chemical influence of a new [(owner.lewd?"master":"leader")]. Your highest priority is now to stay by [creatorName]'s side, following and aiding them at all costs.</i></span>")) //THIS SHOULD ONLY EVER APPEAR IF YOU MINDBREAK YOURSELF AND THEN GET INJECTED FROM SOMEONE ELSE.
to_chat(M, to_chat(M, "<span class='big love'><i>Your aldled, plastic, mind bends under the chemical influence of a new [(M.lewd?"master":"leader")]. Your highest priority is now to stay by [creatorName]'s side, following and aiding them at all costs.</i></span>")) //THIS SHOULD ONLY EVER APPEAR IF YOU MINDBREAK YOURSELF AND THEN GET INJECTED FROM SOMEONE ELSE.
return
if(purity < 0.5)//Impure chems don't function as you expect
return
modular_citadel/code/modules/reagents/objects/items.dm
+3 -3
View File
@@ -28,8 +28,8 @@
add_fingerprint(user)
return
. = ..()
if(. & COMPONENT_NO_INTERACT)
return
if(. & COMPONENT_NO_INTERACT)
return
var/I = user.get_active_held_item()
if(!I)
user.put_in_active_hand(src)
@@ -97,7 +97,7 @@
/obj/item/FermiChem/pHmeter/afterattack(atom/A, mob/user, proximity)
. = ..()
if(!istype(A, obj/item/reagent_containers))
if(!istype(A, /obj/item/reagent_containers))
return
var/obj/item/reagent_containers/cont = A
if(LAZYLEN(cont.reagents.reagent_list) == null)