cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 19:44:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes command immune to FAMILIES (#2175)

Browse Source 
* Makes command immune to FAMILIES

* makes blueshield immune
This commit is contained in:
GuppyLaxx
2021-01-18 15:38:25 -04:00
committed by GitHub
parent 8c462a16aa
commit 3312bfb1fc
4 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/gang/gang_things.dm
+2 -2
View File
@@ -12,9 +12,9 @@
/obj/item/gang_induction_package/attack_self(mob/living/user)
..()
if(HAS_TRAIT(user, TRAIT_MINDSHIELD))
/*if(HAS_TRAIT(user, TRAIT_MINDSHIELD))
to_chat(user, "You attended a seminar on not signing up for a gang and are not interested.")
return
return*/
if(user.mind.has_antag_datum(/datum/antagonist/ert/families))
to_chat(user, "As a police officer, you can't join this family. However, you pretend to accept it to keep your cover up.")
for(var/threads in team_to_use.free_clothes)
modular_skyrat/modules/antagonists/code/gamemodes.dm
+3
View File
@@ -13,6 +13,9 @@
/datum/game_mode/heretics
protected_jobs = list("Prisoner", "Blueshield", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
/datum/game_mode/gang
protected_jobs = list("Prisoner", "Blueshield", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //i hate whoever just copy pasted this a bunch of times
/datum/dynamic_ruleset/roundstart/traitor
protected_roles = list("Prisoner", "Blueshield", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
modular_skyrat/modules/antagonists/code/gang_things.dm
+14
View File
@@ -0,0 +1,14 @@
/obj/item/gang_induction_package/attack_self(mob/living/user)
if(user.mind.assigned_role in GLOB.command_positions)
to_chat(user, "Joining a gang would hurt profits, wouldn't it? Central wouldn't be happy.")
user.emote("shake")
return
if(user.mind.assigned_role == "Blueshield")
to_chat(user, "It'd be a terrible idea. What about the Heads of Staff?")
user.emote("shake")
return
if(HAS_TRAIT(user, TRAIT_MINDSHIELD))
to_chat(user, "You attended a seminar on not signing up for a gang and are not interested.")
user.emote("shake")
return
..()
tgstation.dme
+1
View File
@@ -3404,6 +3404,7 @@
#include "modular_skyrat\modules\ambitions\code\antag_datums.dm"
#include "modular_skyrat\modules\ambitions\code\mind.dm"
#include "modular_skyrat\modules\antagonists\code\gamemodes.dm"
#include "modular_skyrat\modules\antagonists\code\gang_things.dm"
#include "modular_skyrat\modules\antagonists\code\modules\uplink\uplink_items.dm"
#include "modular_skyrat\modules\autotransfer\code\autotransfer.dm"
#include "modular_skyrat\modules\autotransfer\code\autotransfer_config.dm"