mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
Fixes a bunch of stuff because testmerges are for pussies (#14187)
* for fucks sake this is why we testmerge shit * Update flowers.dm * Update nettle.dm * Update cigs_lighters.dm * Update theft_tools.dm * Update flashlight.dm * Update items.dm * Update supermatter_delaminator.dm * Update spacevine.dm
This commit is contained in:
@@ -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 == BURN)
|
||||
. = 0
|
||||
else
|
||||
. = expected_damage
|
||||
|
||||
Reference in New Issue
Block a user