cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14232 from DeltaFire15/better-be-named

Browse Source 
Fixes & Improves some antagpanel stuff
This commit is contained in:
silicons
2021-02-12 19:00:07 -07:00
committed by GitHub
parent 0e08620cc1 b0ff405a13
commit ae55071fe8
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/antagonists/clockcult/clockcult.dm
View File

@@ -15,13 +15,16 @@
var/ignore_holy_water = FALSE var/ignore_holy_water = FALSE
/datum/antagonist/clockcult/silent /datum/antagonist/clockcult/silent
name = "Silent Clock Cultist"
silent = TRUE silent = TRUE
show_in_antagpanel = FALSE //internal show_in_antagpanel = FALSE //internal
/datum/antagonist/clockcult/neutered /datum/antagonist/clockcult/neutered
name = "Neutered Clock Cultist"
neutered = TRUE neutered = TRUE
/datum/antagonist/clockcult/neutered/traitor /datum/antagonist/clockcult/neutered/traitor
name = "Traitor Clock Cultist"
ignore_eligibility_check = TRUE ignore_eligibility_check = TRUE
ignore_holy_water = TRUE ignore_holy_water = TRUE
show_in_roundend = FALSE show_in_roundend = FALSE
@@ -185,7 +188,7 @@
/datum/antagonist/clockcult/admin_add(datum/mind/new_owner,mob/admin) /datum/antagonist/clockcult/admin_add(datum/mind/new_owner,mob/admin)
add_servant_of_ratvar(new_owner.current, TRUE) add_servant_of_ratvar(new_owner.current, TRUE, override_type = type)
message_admins("[key_name_admin(admin)] has made [new_owner.current] into a servant of Ratvar.") message_admins("[key_name_admin(admin)] has made [new_owner.current] into a servant of Ratvar.")
log_admin("[key_name(admin)] has made [new_owner.current] into a servant of Ratvar.") log_admin("[key_name(admin)] has made [new_owner.current] into a servant of Ratvar.")

2
code/modules/antagonists/cult/cult.dm
View File

@@ -19,9 +19,11 @@
var/ignore_holy_water = FALSE var/ignore_holy_water = FALSE
/datum/antagonist/cult/neutered /datum/antagonist/cult/neutered
name = "Neutered Cultist"
neutered = TRUE neutered = TRUE
/datum/antagonist/cult/neutered/traitor /datum/antagonist/cult/neutered/traitor
name = "Traitor Cultist"
ignore_eligibility_checks = TRUE ignore_eligibility_checks = TRUE
ignore_holy_water = TRUE ignore_holy_water = TRUE
show_in_roundend = FALSE show_in_roundend = FALSE