cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 02:24:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

reworks the changeling shield (#23334)

Browse Source 
* reworks the changeling shield

* oh yeah

* Update code/modules/antagonists/changeling/powers/mutations.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
GDN
2023-12-24 05:01:21 -06:00
committed by GitHub
parent 3fc823ba3f
commit 4fda5a1dac
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/changeling/powers/mutations.dm
+7 -5
View File
@@ -390,7 +390,7 @@
/datum/action/changeling/weapon/shield
name = "Organic Shield"
desc = "We reform one of our arms into a hard shield. Costs 20 chemicals."
helptext = "Organic tissue cannot resist damage forever. The shield will break after it is hit too much. The more DNA we collect, the stronger it is. Cannot be used while in lesser form."
helptext = "Organic tissue cannot resist damage forever, with the shield breaking after it is hit 6 times. Automatically parries. Cannot be used while in lesser form."
button_icon_state = "organic_shield"
chemical_cost = 20
dna_cost = 2
@@ -404,7 +404,6 @@
var/obj/item/shield/changeling/S = ..(user)
if(!S)
return FALSE
S.remaining_uses = round(cling.absorbed_count * 3)
return TRUE
/obj/item/shield/changeling
@@ -413,7 +412,7 @@
flags = NODROP | DROPDEL
icon_state = "ling_shield"
var/remaining_uses //Set by the changeling ability.
var/remaining_uses = 6
/obj/item/shield/changeling/Initialize(mapload)
. = ..()
@@ -423,6 +422,10 @@
playsound(loc, 'sound/effects/bone_break_1.ogg', 100, TRUE)
/obj/item/shield/changeling/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
SEND_SIGNAL(owner, COMSIG_HUMAN_PARRY)
. = ..()
if(!.)
return
if(remaining_uses < 1)
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
@@ -430,10 +433,9 @@
playsound(loc, 'sound/effects/bone_break_2.ogg', 100, TRUE)
H.unEquip(src, 1)
qdel(src)
return 0
return FALSE
else
remaining_uses--
return ..()
/***************************************\
|*********SPACE SUIT + HELMET***********|