cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

damage flags are now defined from tg (#14050)

Browse Source 
* 1st

* s

* d

Co-authored-by: Theos <theubernyan@gmail.com>
This commit is contained in:
tattax
2022-05-16 16:14:12 -03:00
committed by GitHub
parent 7dcaac7647
commit 7cc7105157
300 changed files with 771 additions and 739 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/events/holiday/xmas.dm
View File

@@ -36,7 +36,7 @@
icon_state = "xmashat"
desc = "A crappy paper hat that you are REQUIRED to wear."
flags_inv = 0
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0)
/obj/effect/spawner/xmastree
name = "christmas tree spawner"

4
code/modules/events/spacevine.dm
View File

@@ -124,7 +124,7 @@
return 1
/datum/spacevine_mutation/fire_proof/on_hit(obj/structure/spacevine/holder, mob/hitter, obj/item/I, expected_damage)
if(I && I.damtype == "fire")
if(I && I.damtype == FIRE)
. = 0
else
. = expected_damage
@@ -332,7 +332,7 @@
for(var/datum/spacevine_mutation/SM in mutations)
damage_dealt = SM.on_hit(src, user, I, damage_dealt) //on_hit now takes override damage as arg and returns new value for other mutations to permutate further
take_damage(damage_dealt, I.damtype, "melee", 1)
take_damage(damage_dealt, I.damtype, MELEE, 1)
/obj/structure/spacevine/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
switch(damage_type)