Refactors explosions

2017-05-24 16:45:00 -05:00
parent 869953cd18
commit 11344c4682
41 changed files with 932 additions and 139 deletions
@@ -0,0 +1,10 @@
+diff a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm	(rejected hunks)
+@@ -72,7 +72,7 @@
+ 	special_names = list("Flood","Fire","Bar","Man")
+ 
+ /datum/species/golem/plasma/spec_death(gibbed, mob/living/carbon/human/H)
+-	SSexplosion.Create(get_turf(H),0,1,2,flame_range = 5)
+	explosion(get_turf(H),0,1,2,flame_range = 5)
+ 	if(H)
+ 		H.gib()
+ 
@@ -23,7 +23,7 @@

 	if(explosive)
 		spawn(10)
-			explosion(src.loc, 3, 6, 12, 15)
+			explosion(src.loc, 3, 6, 12, 15)

 	for(var/obj/machinery/ai_status_display/O in world) //change status
 		if(src.key)
@@ -0,0 +1,10 @@
+diff a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm	(rejected hunks)
+@@ -130,7 +130,7 @@ Difficulty: Medium
+ 	playsound(T,'sound/magic/Fireball.ogg', 200, 1)
+ 	new /obj/effect/overlay/temp/fireball(T)
+ 	sleep(12)
+-	SSexplosion.Create(T, 0, 0, 1, 0, 0, 0, 1)
+	explosion(T, 0, 0, 1, 0, 0, 0, 1)
+ 
+ /mob/living/simple_animal/hostile/megafauna/dragon/OpenFire()
+ 	anger_modifier = Clamp(((maxHealth - health)/50),0,20)