mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-11 07:03:30 +01:00
Adds CI to restrict types in a file (#24694)
* LETS GAMBLE! * oops * even more oops * alright lets fuckin do it * real names please * comment * Contributing.md update * maybe someone will find this todo * actually lets make it a define so people can't mistype it * review * changes
This commit is contained in:
@@ -1,3 +1,5 @@
|
||||
RESTRICT_TYPE(/datum/antagonist)
|
||||
|
||||
GLOBAL_LIST_EMPTY(antagonists)
|
||||
|
||||
#define SUCCESSFUL_DETACH "dont touch this string numbnuts"
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
RESTRICT_TYPE(/datum/antagonist/changeling)
|
||||
|
||||
/datum/antagonist/changeling
|
||||
name = "Changeling"
|
||||
roundend_category = "changelings"
|
||||
@@ -440,8 +442,5 @@
|
||||
else
|
||||
to_chat(L, "<span class='notice'>While our current form may be lifeless, this is not the end for us as we can still regenerate!</span>")
|
||||
|
||||
/proc/ischangeling(mob/M)
|
||||
return M.mind?.has_antag_datum(/datum/antagonist/changeling)
|
||||
|
||||
/datum/antagonist/changeling/custom_blurb()
|
||||
return "We awaken on the [station_name()], [get_area_name(owner.current, TRUE)]...\nWe have our tasks to attend to..."
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
RESTRICT_TYPE(/datum/antagonist/cultist)
|
||||
|
||||
/datum/antagonist/cultist
|
||||
name = "Cultist"
|
||||
job_rank = ROLE_CULTIST
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
RESTRICT_TYPE(/datum/team/cult)
|
||||
|
||||
/datum/team/cult
|
||||
name = "Cult"
|
||||
antag_datum_type = /datum/antagonist/cultist
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
RESTRICT_TYPE(/datum/antagonist/rev/head)
|
||||
|
||||
/datum/antagonist/rev/head
|
||||
name = "Head Revolutionary"
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
RESTRICT_TYPE(/datum/antagonist/rev)
|
||||
|
||||
/datum/antagonist/rev
|
||||
name = "Revolutionary"
|
||||
roundend_category = "revs"
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
RESTRICT_TYPE(/datum/team/revolution)
|
||||
|
||||
/datum/team/revolution
|
||||
name = "Revolution"
|
||||
antag_datum_type = /datum/antagonist/rev
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
RESTRICT_TYPE(/datum/antagonist/mindslave)
|
||||
|
||||
// For Mindslaves and Zealots
|
||||
/datum/antagonist/mindslave
|
||||
@@ -87,7 +88,3 @@
|
||||
slaved.serv -= owner
|
||||
slaved.leave_serv_hud(owner)
|
||||
owner.som = null
|
||||
|
||||
// Helper proc that determines if a mob is a mindslave.
|
||||
/proc/ismindslave(mob/living/carbon/human/H)
|
||||
return istype(H) && H.mind.has_antag_datum(/datum/antagonist/mindslave, FALSE)
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
RESTRICT_TYPE(/datum/antagonist/traitor)
|
||||
|
||||
// Syndicate Traitors.
|
||||
/datum/antagonist/traitor
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
RESTRICT_TYPE(/datum/antagonist/vampire)
|
||||
|
||||
/datum/antagonist/vampire
|
||||
name = "Vampire"
|
||||
antag_hud_type = ANTAG_HUD_VAMPIRE
|
||||
@@ -33,27 +35,6 @@
|
||||
blurb_b = 138
|
||||
blurb_a = 1
|
||||
|
||||
/datum/antagonist/mindslave/thrall
|
||||
name = "Vampire Thrall"
|
||||
antag_hud_type = ANTAG_HUD_VAMPIRE
|
||||
antag_hud_name = "vampthrall"
|
||||
|
||||
/datum/antagonist/mindslave/thrall/add_owner_to_gamemode()
|
||||
SSticker.mode.vampire_enthralled += owner
|
||||
|
||||
/datum/antagonist/mindslave/thrall/remove_owner_from_gamemode()
|
||||
SSticker.mode.vampire_enthralled -= owner
|
||||
|
||||
/datum/antagonist/mindslave/thrall/apply_innate_effects(mob/living/mob_override)
|
||||
mob_override = ..()
|
||||
var/datum/mind/M = mob_override.mind
|
||||
M.AddSpell(new /datum/spell/vampire/thrall_commune)
|
||||
|
||||
/datum/antagonist/mindslave/thrall/remove_innate_effects(mob/living/mob_override)
|
||||
mob_override = ..()
|
||||
var/datum/mind/M = mob_override.mind
|
||||
M.RemoveSpell(/datum/spell/vampire/thrall_commune)
|
||||
|
||||
/datum/antagonist/vampire/Destroy(force, ...)
|
||||
owner.current.create_log(CONVERSION_LOG, "De-vampired")
|
||||
draining = null
|
||||
@@ -361,9 +342,7 @@
|
||||
mob_override.dna?.species.hunger_icon = 'icons/mob/screen_hunger_vampire.dmi'
|
||||
check_vampire_upgrade(FALSE)
|
||||
|
||||
/datum/hud/proc/remove_vampire_hud()
|
||||
static_inventory -= vampire_blood_display
|
||||
QDEL_NULL(vampire_blood_display)
|
||||
|
||||
|
||||
/datum/antagonist/vampire/custom_blurb()
|
||||
return "On the date [GLOB.current_date_string], at [station_time_timestamp()],\n in the [station_name()], [get_area_name(owner.current, TRUE)]...\nThe hunt begins again..."
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
RESTRICT_TYPE(/datum/antagonist/mindslave/thrall)
|
||||
|
||||
/datum/antagonist/mindslave/thrall
|
||||
name = "Vampire Thrall"
|
||||
antag_hud_type = ANTAG_HUD_VAMPIRE
|
||||
antag_hud_name = "vampthrall"
|
||||
|
||||
/datum/antagonist/mindslave/thrall/add_owner_to_gamemode()
|
||||
SSticker.mode.vampire_enthralled += owner
|
||||
|
||||
/datum/antagonist/mindslave/thrall/remove_owner_from_gamemode()
|
||||
SSticker.mode.vampire_enthralled -= owner
|
||||
|
||||
/datum/antagonist/mindslave/thrall/apply_innate_effects(mob/living/mob_override)
|
||||
mob_override = ..()
|
||||
var/datum/mind/M = mob_override.mind
|
||||
M.AddSpell(new /datum/spell/vampire/thrall_commune)
|
||||
|
||||
/datum/antagonist/mindslave/thrall/remove_innate_effects(mob/living/mob_override)
|
||||
mob_override = ..()
|
||||
var/datum/mind/M = mob_override.mind
|
||||
M.RemoveSpell(/datum/spell/vampire/thrall_commune)
|
||||
Reference in New Issue
Block a user