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

Merge pull request #4 from Poojawa/QoL

Browse Source 
quality of life
This commit is contained in:
LetterJay
2016-08-10 02:59:02 -04:00
committed by GitHub
parent 0e5abb8ed8 582c76840b
commit 9bec2c18a9
13 changed files with 78 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/mob/living/carbon/human/human.dm
View File

@@ -695,22 +695,23 @@
threatcount += 2
//Check for dresscode violations
if(istype(head, /obj/item/clothing/head/wizard) || istype(head, /obj/item/clothing/head/helmet/space/hardsuit/wizard))
threatcount += 2
if(istype(head, /obj/item/clothing/head/wizard) || istype(head, /obj/item/clothing/head/helmet/space/hardsuit/wizard) || istype(head, /obj/item/clothing/head/helmet/space/hardsuit/syndi) || istype(head, /obj/item/clothing/head/helmet/space/syndicate) || istype(head, /obj/item/clothing/head/culthood) || istype(head, /obj/item/clothing/head/helmet/space/cult))
threatcount += 5
//Check for nonhuman scum
if(dna && dna.species.id && dna.species.id != "human")
threatcount += 1
threatcount += 0
//mindshield implants imply trustworthyness
//Loyalty implants imply trustworthyness
if(isloyal(src))
threatcount -= 1
//Agent cards lower threatlevel.
//Agent cards lower threatlevel, but only just enough to avoid dresscode violations.
if(istype(idcard, /obj/item/weapon/card/id/syndicate))
threatcount -= 5
threatcount -= 2
return threatcount
return threatcount
//Used for new human mobs created by cloning/goleming/podding