cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 19:17:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4777 from Kyep/mindshield

Browse Source 
Renames Loyalty implants to Mindshield implants
This commit is contained in:
TheDZD
2016-06-30 12:03:03 -04:00
committed by GitHub
parent 398d2ec569 3183192c27
commit 3a262b7a67
16 changed files with 63 additions and 63 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
@@ -217,7 +217,7 @@
if(judgebot.check_for_weapons(r_hand))
threatcount += 4
//Loyalty implants imply trustworthyness
//Mindshield implants imply trustworthyness
if(isloyal(src))
threatcount -= 1
code/modules/mob/living/carbon/human/human.dm
+1 -1
View File
@@ -1882,7 +1882,7 @@
threatcount += 2
//Loyalty implants imply trustworthyness
//Mindshield implants imply slight trustworthiness
if(isloyal(src))
threatcount -= 1
code/modules/mob/living/carbon/superheroes.dm
+2 -2
View File
@@ -191,14 +191,14 @@
if(isloyal(target))
to_chat(usr, "<span class='notice'>They are enslaved by Nanotrasen. You feel their interest in your cause wane and disappear.</span>")
usr.visible_message("<span class='danger'>[usr] stops talking for a moment, then moves back away from [target].</span>")
to_chat(target, "<span class='danger'>Your loyalty implant activates and a sharp pain reminds you of your loyalties to Nanotrasen.</span>")
to_chat(target, "<span class='danger'>Your mindshield implant activates, protecting you from conversion.</span>")
return
if(3)
to_chat(usr, "<span class='notice'>You begin filling out the application form with [target].</span>")
usr.visible_message("<span class='danger'>[usr] pulls out a pen and paper and begins filling an application form with [target].</span>")
to_chat(target, "<span class='danger'>You are being convinced by [usr] to fill out an application form to become a henchman.</span>")//Ow the edge
if(!do_mob(usr, target, 100)) //around 30 seconds total for enthralling, 45 for someone with a loyalty implant
if(!do_mob(usr, target, 100)) //around 30 seconds total for enthralling, 45 for someone with a mindshield implant
to_chat(usr, "<span class='danger'>The enrollment process has been interrupted - you have lost the attention of [target].</span>")
to_chat(target, "<span class='warning'>You move away and are no longer under the charm of [usr]. The application form is null and void.</span>")
recruiting = 0
code/modules/mob/mob_helpers.dm
+1 -1
View File
@@ -22,7 +22,7 @@
return 0
return 1
/proc/isloyal(A) //Checks to see if the person contains a loyalty implant, then checks that the implant is actually inside of them
/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)
if(L && L.implanted)
return 1