Combat rework adjustments (Making use of 512's new filter feature, small balance tweaks, and more) (#6092)
* makes use of 512's filters, adds combat mode toggle component signals, and more * Update phantomthief.dm * Update living.dm
This commit is contained in:
@@ -0,0 +1,11 @@
|
||||
/obj/item/clothing/glasses/phantomthief
|
||||
name = "suspicious paper mask"
|
||||
desc = "A cheap, Syndicate-branded paper face mask. They'll never see it coming."
|
||||
alternate_worn_icon = 'icons/mob/mask.dmi'
|
||||
icon = 'icons/obj/clothing/masks.dmi'
|
||||
icon_state = "s-ninja"
|
||||
item_state = "s-ninja"
|
||||
|
||||
/obj/item/clothing/glasses/phantomthief/Initialize()
|
||||
. = ..()
|
||||
AddComponent(/datum/component/phantomthief)
|
||||
@@ -27,6 +27,7 @@
|
||||
if(hud_used && hud_used.static_inventory)
|
||||
for(var/obj/screen/combattoggle/selector in hud_used.static_inventory)
|
||||
selector.rebasetointerbay(src)
|
||||
SendSignal(COMSIG_COMBAT_TOGGLED, src, combatmode)
|
||||
return TRUE
|
||||
|
||||
/mob/living/carbon/Move(atom/newloc, direct = 0)
|
||||
|
||||
@@ -111,9 +111,11 @@
|
||||
if(combatmode)
|
||||
toggle_combat_mode()
|
||||
recoveringstam = TRUE
|
||||
filters += CIT_FILTER_STAMINACRIT
|
||||
update_canmove()
|
||||
if(recoveringstam && total_health >= STAMINA_SOFTCRIT_TRADITIONAL)
|
||||
to_chat(src, "<span class='notice'>You don't feel nearly as exhausted anymore.</span>")
|
||||
recoveringstam = FALSE
|
||||
filters -= CIT_FILTER_STAMINACRIT
|
||||
update_canmove()
|
||||
update_health_hud()
|
||||
|
||||
@@ -10,3 +10,10 @@
|
||||
|
||||
/datum/uplink_item/dangerous/revolver
|
||||
item = /obj/item/gun/ballistic/revolver/syndie
|
||||
|
||||
/datum/uplink_item/badass/phantomthief
|
||||
name = "Syndicate Mask"
|
||||
desc = "A cheap paper mask to slap over your eyes."
|
||||
item = /obj/item/clothing/glasses/phantomthief
|
||||
cost = 0
|
||||
limited_stock = 4
|
||||
|
||||
Reference in New Issue
Block a user