cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7080 from SamHPurp/loyalty-to-mindshield

Browse Source 
Refactors any remaining Loyalty references to Mindshield
This commit is contained in:
Fox McCloud
2017-04-11 19:50:59 -04:00
committed by GitHub
parent 041132d60d fa96e00509
commit 0edc5400b3
33 changed files with 79 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/alien/alien.dm
+1 -1
View File
@@ -220,7 +220,7 @@
threatcount += 4
//Mindshield implants imply trustworthyness
if(isloyal(src))
if(ismindshielded(src))
threatcount -= 1
return threatcount
code/modules/mob/living/carbon/human/human.dm
+1 -1
View File
@@ -1892,7 +1892,7 @@
//Mindshield implants imply slight trustworthiness
if(isloyal(src))
if(ismindshielded(src))
threatcount -= 1
//Agent cards lower threatlevel.
code/modules/mob/living/carbon/human/human_defines.dm
+1 -1
View File
@@ -1,7 +1,7 @@
var/global/default_martial_art = new/datum/martial_art
/mob/living/carbon/human
hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPLOYAL_HUD,IMPCHEM_HUD,IMPTRACK_HUD,SPECIALROLE_HUD,NATIONS_HUD)
hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPMINDSHIELD_HUD,IMPCHEM_HUD,IMPTRACK_HUD,SPECIALROLE_HUD,NATIONS_HUD)
//Marking colour and style
var/list/m_colours = DEFAULT_MARKING_COLOURS //All colours set to #000000.
code/modules/mob/living/carbon/superheroes.dm
+1 -1
View File
@@ -189,7 +189,7 @@
to_chat(target, "<span class='danger'>You feel yourself agreeing with [user], and a surge of loyalty begins building.</span>")
target.Weaken(12)
sleep(20)
if(isloyal(target))
if(ismindshielded(target))
to_chat(user, "<span class='notice'>They are enslaved by Nanotrasen. You feel their interest in your cause wane and disappear.</span>")
user.visible_message("<span class='danger'>[user] stops talking for a moment, then moves back away from [target].</span>")
to_chat(target, "<span class='danger'>Your mindshield implant activates, protecting you from conversion.</span>")
code/modules/mob/mob_helpers.dm
+2 -2
View File
@@ -41,8 +41,8 @@
else if(eyes) //If they're not, check to see if their eyes got one of them there colour matrices. Will be null if eyes are robotic/the mob isn't colourblind and they have no default colour matrix.
return eyes.get_colourmatrix()
/proc/isloyal(A) //Checks to see if the person contains a mindshield implant, then checks that the implant is actually inside of them
for(var/obj/item/weapon/implant/loyalty/L in A)
/proc/ismindshielded(A) //Checks to see if the person contains a mindshield implant, then checks that the implant is actually inside of them
for(var/obj/item/weapon/implant/mindshield/L in A)
if(L && L.implanted)
return 1
return 0