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

Compile fixes and tweaks.

Browse Source
This commit is contained in:
Fermi
2019-09-10 18:54:47 +01:00
parent 8b20df838d
commit f03c9c236d
3 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
+2
View File
@@ -210,6 +210,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
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 [(M.client?.prefs.lewdchem?"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.
log_game("FERMICHEM: Narcissist [M] ckey: [M.key] been rebound to [creatorName], ID: [creatorID]")
E.political = political
return
if((M.ckey == creatorID) && (creatorName == M.real_name)) //same name AND same player - same instance of the player. (should work for clones?)
log_game("FERMICHEM: [M] ckey: [M.key] has been given velvetspeech")
@@ -287,6 +288,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
E.enthrallID = creatorID
E.enthrallGender = creatorGender
E.master = creator
E.political = political
else
E = M.has_status_effect(/datum/status_effect/chem/enthrall)
if(M.client?.prefs.lewdchem)
modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+6 -1
View File
@@ -110,6 +110,11 @@
W.armor = W.armor.modifyAllRatings(hatArmor)
..()
/datum/reagent/fermi/hatmium/reaction_turf(turf/T, reac_volume)
if(reac_volume >= 5)
new /obj/item/clothing/head/hattip(T)
..()
////////////////////////////////////////////////////////////////////////////////////////////////////
// FURRANIUM
///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -472,7 +477,7 @@
/datum/reagent/fermi/secretcatchem/reaction_mob(var/mob/living/L)
if(istype(L, /mob/living/simple_animal/pet/cat/custom_cat) && cached_purity => 0.95)
if(istype(L, /mob/living/simple_animal/pet/cat/custom_cat) && cached_purity >= 0.95)
var/mob/living/simple_animal/pet/cat/custom_cat/catto = L
if(catto.origin)
var/mob/living/carbon/human/H = catto.origin