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

Merge remote-tracking branch 'upstream/master' into poolit

Browse Source 
Conflicts:
	code/game/objects/structures/displaycase.dm
	code/game/objects/structures/grille.dm
	code/game/objects/structures/lamarr_cage.dm
This commit is contained in:
Tigercat2000
2015-06-22 13:40:07 -07:00
parent 0918ded8be 44f7ad997c
commit bcb4a9601f
104 changed files with 541 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/tram/tram.dm
-3
View File
@@ -242,9 +242,6 @@
if(prob(50))
qdel(src)
/obj/tram/meteorhit()
qdel(src)
/obj/tram/attack_animal(var/mob/living/simple_animal/M as mob)
if(M.melee_damage_upper == 0) return
if(prob(M.melee_damage_upper))