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

Merge remote-tracking branch 'Fox/fixessssss' into okayletstrysomethingslightlydifferent

Browse Source 
Conflicts:
	code/modules/reagents/reagent_containers/glass_containers.dm
	maps/cyberiad.dmm

Fawwkss wai ;-;
This commit is contained in:
Tigercat2000
2015-04-29 15:31:21 -07:00
parent 38ab273dda c1826deeda
commit 43a09daddc
9 changed files with 622 additions and 629 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/igniter.dm
+1 -1
View File
@@ -22,7 +22,7 @@
if (istype(src.loc.loc, /obj/item/weapon/reagent_containers/glass/beaker/))
var/obj/item/weapon/reagent_containers/glass/beaker/beakerbomb = src.loc.loc
if(beakerbomb)
beakerbomb.ignite()
beakerbomb.heat_beaker()
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src)