shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into embed-changes

Browse Source
This commit is contained in:
Timothy Teakettle
2020-06-15 22:48:26 +01:00
parent c1d966ca44 1d3cad02ef
commit 7fbfb4ad0e
180 changed files with 5227 additions and 1997 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/spacevine.dm
+2 -2
View File
@@ -330,8 +330,8 @@
if(!override)
qdel(src)
/obj/structure/spacevine/attacked_by(obj/item/I, mob/living/user)
var/damage_dealt = I.force
/obj/structure/spacevine/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
var/damage_dealt = I.force * damage_multiplier
if(I.get_sharpness())
damage_dealt *= 4
if(I.damtype == BURN)