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

finish making smoke OOP, compiles

Browse Source
This commit is contained in:
uraniummeltdown
2017-11-03 22:46:49 +04:00
parent 4d0ea7b630
commit a0939ca93b
30 changed files with 53 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/apc.dm
+1 -1
View File
@@ -1056,7 +1056,7 @@
cell.corrupt()
src.malfhack = 1
update_icon()
var/datum/effect/system/harmless_smoke_spread/smoke = new /datum/effect/system/harmless_smoke_spread()
var/datum/effect/system/smoke_spread/smoke = new
smoke.set_up(3, 0, src.loc)
smoke.attach(src)
smoke.start()
code/modules/power/singularity/narsie.dm
+1 -1
View File
@@ -41,7 +41,7 @@
/obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)
makeNewConstruct(/mob/living/simple_animal/hostile/construct/harvester, user, null, 1)
new /obj/effect/effect/sleep_smoke(user.loc)
new /obj/effect/effect/smoke/sleeping(user.loc)
/obj/singularity/narsie/process()
code/modules/power/smes.dm
+2 -2
View File
@@ -440,7 +440,7 @@
for(var/mob/M in viewers(src))
M.show_message("<span class='warning'>The [src.name] is making strange noises!</span>", 3, "<span class='warning'>You hear sizzling electronics.</span>", 2)
sleep(10*pick(4,5,6,7,10,14))
var/datum/effect/system/harmless_smoke_spread/smoke = new /datum/effect/system/harmless_smoke_spread()
var/datum/effect/system/smoke_spread/smoke = new
smoke.set_up(3, 0, src.loc)
smoke.attach(src)
smoke.start()
@@ -456,7 +456,7 @@
else
emp_act(2)
if(prob(5)) //smoke only
var/datum/effect/system/harmless_smoke_spread/smoke = new /datum/effect/system/harmless_smoke_spread()
var/datum/effect/system/smoke_spread/smoke = new
smoke.set_up(3, 0, src.loc)
smoke.attach(src)
smoke.start()