cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

MapMerge/SpeciesCheck

Browse Source
This commit is contained in:
Serket
2018-02-11 16:03:27 -07:00
parent 00d501c7df
commit 8930359edc
3 changed files with 10745 additions and 10743 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/cyberiad/cyberiad.dmm
+8993 -8992
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/cyberiad/z2.dmm
+1751 -1750
View File
File diff suppressed because it is too large Load Diff
code/modules/projectiles/projectile/magic.dm
+1 -1
View File
@@ -27,7 +27,7 @@
/obj/item/projectile/magic/death/on_hit(var/mob/living/carbon/G)
. = ..()
if(isliving(G))
if(istype(G, /mob/living/carbon/human/machine)) //speshul snowfleks deserv speshul treetment
if(G.get_species() == "Machine") //speshul snowfleks deserv speshul treetment
G.adjustFireLoss(6969) //remember - slimes love fire
else
G.death()