mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-24 05:23:22 +01:00
Fix Antag Skills (#22337)
Fixes antags not correctly wiping their skill components upon being promoted to antagonist.
This commit is contained in:
@@ -19,6 +19,10 @@
|
||||
announce_antagonist_spawn()
|
||||
LAZYDISTINCTADD(SSticker.mode.antag_templates, src)
|
||||
|
||||
// Antags wipe skill components so that they can bypass skill restrictions entirely.
|
||||
for(var/skill in target.current.GetComponents(/datum/component/skill))
|
||||
qdel(skill)
|
||||
|
||||
/datum/antagonist/proc/create_default(var/mob/source)
|
||||
var/mob/living/M
|
||||
if(mob_path)
|
||||
|
||||
@@ -43,9 +43,6 @@ GLOBAL_DATUM(actors, /datum/antagonist/actor)
|
||||
player.update_eyes()
|
||||
player.regenerate_icons()
|
||||
|
||||
// Offship antags wipe skill components so that they can bypass skill restrictions entirely.
|
||||
for(var/datum/component/skill/skill in player._datum_components)
|
||||
qdel(skill)
|
||||
|
||||
return TRUE
|
||||
|
||||
|
||||
@@ -52,9 +52,6 @@ GLOBAL_DATUM(burglars, /datum/antagonist/burglar)
|
||||
player.update_eyes()
|
||||
player.regenerate_icons()
|
||||
|
||||
// Offship antags wipe skill components so that they can bypass skill restrictions entirely.
|
||||
for(var/datum/component/skill/skill in player._datum_components)
|
||||
qdel(skill)
|
||||
|
||||
return TRUE
|
||||
|
||||
|
||||
@@ -51,9 +51,6 @@ GLOBAL_DATUM(jockeys, /datum/antagonist/jockey)
|
||||
player.update_eyes()
|
||||
player.regenerate_icons()
|
||||
|
||||
// Offship antags wipe skill components so that they can bypass skill restrictions entirely.
|
||||
for(var/datum/component/skill/skill in player._datum_components)
|
||||
qdel(skill)
|
||||
|
||||
return TRUE
|
||||
|
||||
|
||||
@@ -54,8 +54,5 @@ GLOBAL_DATUM(loners, /datum/antagonist/loner)
|
||||
player.update_eyes()
|
||||
player.regenerate_icons()
|
||||
|
||||
// Offship antags wipe skill components so that they can bypass skill restrictions entirely.
|
||||
for(var/datum/component/skill/skill in player._datum_components)
|
||||
qdel(skill)
|
||||
|
||||
return TRUE
|
||||
|
||||
@@ -54,9 +54,6 @@ GLOBAL_DATUM(mercs, /datum/antagonist/mercenary)
|
||||
|
||||
give_codewords(player)
|
||||
|
||||
// Offship antags wipe skill components so that they can bypass skill restrictions entirely.
|
||||
for(var/datum/component/skill/skill in player._datum_components)
|
||||
qdel(skill)
|
||||
|
||||
return TRUE
|
||||
|
||||
|
||||
@@ -117,9 +117,6 @@ GLOBAL_DATUM(ninjas, /datum/antagonist/ninja)
|
||||
player.update_eyes()
|
||||
player.regenerate_icons()
|
||||
|
||||
// Offship antags wipe skill components so that they can bypass skill restrictions entirely.
|
||||
for(var/datum/component/skill/skill in player._datum_components)
|
||||
qdel(skill)
|
||||
|
||||
return TRUE
|
||||
|
||||
|
||||
@@ -138,9 +138,6 @@ GLOBAL_DATUM(raiders, /datum/antagonist/raider)
|
||||
|
||||
give_codewords(player)
|
||||
|
||||
// Offship antags wipe skill components so that they can bypass skill restrictions entirely.
|
||||
for(var/datum/component/skill/skill in player._datum_components)
|
||||
qdel(skill)
|
||||
|
||||
return 1
|
||||
|
||||
|
||||
@@ -60,9 +60,6 @@ GLOBAL_DATUM(raider_techno, /datum/antagonist/raider_techno)
|
||||
player.update_eyes()
|
||||
player.regenerate_icons()
|
||||
|
||||
// Offship antags wipe skill components so that they can bypass skill restrictions entirely.
|
||||
for(var/datum/component/skill/skill in player._datum_components)
|
||||
qdel(skill)
|
||||
|
||||
return TRUE
|
||||
|
||||
|
||||
@@ -40,9 +40,6 @@ GLOBAL_DATUM(technomancers, /datum/antagonist/technomancer)
|
||||
technomancer_mob.preEquipOutfit(/obj/outfit/admin/techomancer, FALSE)
|
||||
technomancer_mob.equipOutfit(/obj/outfit/admin/techomancer, FALSE)
|
||||
|
||||
// Offship antags wipe skill components so that they can bypass skill restrictions entirely.
|
||||
for(var/datum/component/skill/skill in technomancer_mob._datum_components)
|
||||
qdel(skill)
|
||||
|
||||
return TRUE
|
||||
|
||||
|
||||
@@ -113,9 +113,6 @@ GLOBAL_DATUM(traitors, /datum/antagonist/traitor)
|
||||
//Begin code phrase.
|
||||
give_codewords(traitor_mob)
|
||||
|
||||
// Offship antags wipe skill components so that they can bypass skill restrictions entirely.
|
||||
for(var/datum/component/skill/skill in traitor_mob._datum_components)
|
||||
qdel(skill)
|
||||
|
||||
/datum/antagonist/traitor/proc/spawn_uplink(var/mob/living/carbon/human/traitor_mob)
|
||||
if(!istype(traitor_mob))
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
author: Hellfirejag
|
||||
delete-after: True
|
||||
changes:
|
||||
- bugfix: "Fixed antags not correctly wiping their skills upon spawning in."
|
||||
Reference in New Issue
Block a user