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

Merge pull request #4212 from Tastyfish/bans

Browse Source 
Cleans up special role jobbans
This commit is contained in:
TheDZD
2016-04-25 18:34:37 -04:00
parent 616beda462 127787aec5
commit cdc20258a1
15 changed files with 86 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/pai/recruit.dm
+1 -1
View File
@@ -354,7 +354,7 @@ var/datum/paiController/paiController // Global handler for pAI candidates
to_chat(O, "\blue <b>A pAI card is looking for personalities. (<a href='?src=\ref[O];jump=\ref[P]'>Teleport</a> | <a href='?src=\ref[src];signup=\ref[O]'>Sign Up</a>)</b>")
//question(O.client)
proc/check_recruit(var/mob/dead/observer/O)
if(jobban_isbanned(O, "pAI") || jobban_isbanned(O,"nonhumandept"))
if(jobban_isbanned(O, ROLE_PAI) || jobban_isbanned(O,"nonhumandept"))
return 0
if(!player_old_enough_antag(O.client,ROLE_PAI))
return 0
code/modules/mob/living/simple_animal/bot/bot.dm
+4 -1
View File
@@ -306,6 +306,9 @@
if(!locked && !open)
var/obj/item/device/paicard/card = W
if(card.pai && card.pai.mind)
if(!card.pai.ckey || jobban_isbanned(card.pai, ROLE_SENTIENT))
to_chat(user, "<span class='warning'>[W] is unable to establish a connection to [src].</span>")
return
if(!user.drop_item())
return
W.forceMove(src)
@@ -322,7 +325,7 @@
else
to_chat(user, "<span class='warning'>The personality slot is locked.</span>")
else
to_chat(user, "<span class='warning'>[src] is not compatible with [W]</span>")
to_chat(user, "<span class='warning'>[src] is not compatible with [W].</span>")
else if(istype(W, /obj/item/weapon/hemostat) && paicard)
if(open)
to_chat(user, "<span class='warning'>Close the access panel before manipulating the personality slot!</span>")
code/modules/mob/mob.dm
+2 -2
View File
@@ -1269,8 +1269,8 @@ mob/proc/yank_out_object()
set name = "Respawn as NPC"
set category = "Ghost"
if(jobban_isbanned(usr, "NPC"))
to_chat(usr, "<span class='warning'>You are banned from playing as NPC's.</span>")
if(jobban_isbanned(usr, ROLE_SENTIENT))
to_chat(usr, "<span class='warning'>You are banned from playing as sentient animals.</span>")
return
if(!ticker || ticker.current_state < 3)
code/modules/mob/transform_procs.dm
+2 -2
View File
@@ -346,10 +346,10 @@
if(ispath(MP, /mob/living/simple_animal/butterfly))
return 1
if(ispath(MP, /mob/living/simple_animal/borer) && !jobban_isbanned(src, "alien") && !jobban_isbanned(src, "Syndicate"))
if(ispath(MP, /mob/living/simple_animal/borer) && !jobban_isbanned(src, ROLE_BORER) && !jobban_isbanned(src, "Syndicate"))
return 1
if(ispath(MP, /mob/living/simple_animal/diona) && !jobban_isbanned(src, "Dionaea"))
if(ispath(MP, /mob/living/simple_animal/diona) && !jobban_isbanned(src, ROLE_NYMPH))
return 1
return 0