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

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into slimegenocide

Browse Source 
# Conflicts:
#	code/__DEFINES/misc.dm
This commit is contained in:
Mark van Alphen
2019-08-13 02:32:53 +02:00
parent 521e81e8d2 47a5e69066
commit d1ad6aad45
549 changed files with 29659 additions and 11302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/effect_system/effects_foam.dm
+1 -1
View File
@@ -94,7 +94,7 @@
spawn(5)
qdel(src)
/obj/effect/particle_effect/foam/Crossed(atom/movable/AM)
/obj/effect/particle_effect/foam/Crossed(atom/movable/AM, oldloc)
if(metal)
return
code/game/objects/effects/effect_system/effects_smoke.dm
+2 -2
View File
@@ -52,7 +52,7 @@
steps--
return 1
/obj/effect/particle_effect/smoke/Crossed(mob/living/M)
/obj/effect/particle_effect/smoke/Crossed(mob/living/M, oldloc)
if(!istype(M))
return
smoke_mob(M)
@@ -207,4 +207,4 @@
return 1
/datum/effect_system/smoke_spread/sleeping
effect_type = /obj/effect/particle_effect/smoke/sleeping
effect_type = /obj/effect/particle_effect/smoke/sleeping