cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Converts our own uses of PoolOrNew to use just new()

Browse Source
This commit is contained in:
Leshana
2017-05-08 21:24:47 -04:00
parent 8fbaa446d1
commit 88f0e65cf9
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/projectiles/guns/energy/particle.dm
View File

@@ -93,20 +93,20 @@
user.visible_message("<span class='warning'>\The [user] fires \the [src], but the shot fizzles in the air!</span>", "<span class='danger'>You fire \the [src], but the shot fizzles in the air!</span>") user.visible_message("<span class='warning'>\The [user] fires \the [src], but the shot fizzles in the air!</span>", "<span class='danger'>You fire \the [src], but the shot fizzles in the air!</span>")
power_supply.charge -= charge_cost power_supply.charge -= charge_cost
playsound(src.loc, fire_sound, 100, 1) playsound(src.loc, fire_sound, 100, 1)
var/datum/effect/effect/system/spark_spread/sparks = PoolOrNew(/datum/effect/effect/system/spark_spread) var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread()
sparks.set_up(2, 1, T) sparks.set_up(2, 1, T)
sparks.start() sparks.start()
update_icon() update_icon()
else if (severity <= 80) //20% chance of shorting out and emptying the cell else if (severity <= 80) //20% chance of shorting out and emptying the cell
user.visible_message("<span class='warning'>\The [user] pulls the trigger, but \the [src] shorts out!</span>", "<span class='danger'>You pull the trigger, but \the [src] shorts out!</span>") user.visible_message("<span class='warning'>\The [user] pulls the trigger, but \the [src] shorts out!</span>", "<span class='danger'>You pull the trigger, but \the [src] shorts out!</span>")
power_supply.charge = 0 power_supply.charge = 0
var/datum/effect/effect/system/spark_spread/sparks = PoolOrNew(/datum/effect/effect/system/spark_spread) var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread()
sparks.set_up(2, 1, T) sparks.set_up(2, 1, T)
sparks.start() sparks.start()
update_icon() update_icon()
else if (severity <= 90) //10% chance of breaking the gun else if (severity <= 90) //10% chance of breaking the gun
user.visible_message("<span class='warning'>\The [user] pulls the trigger, but \the [src] erupts in a shower of sparks!</span>", "<span class='danger'>You pull the trigger, but \the [src] bursts into a shower of sparks!</span>") user.visible_message("<span class='warning'>\The [user] pulls the trigger, but \the [src] erupts in a shower of sparks!</span>", "<span class='danger'>You pull the trigger, but \the [src] bursts into a shower of sparks!</span>")
var/datum/effect/effect/system/spark_spread/sparks = PoolOrNew(/datum/effect/effect/system/spark_spread) var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread()
sparks.set_up(2, 1, T) sparks.set_up(2, 1, T)
sparks.start() sparks.start()
power_supply.charge = 0 power_supply.charge = 0

4
code/modules/telesci/bscyrstal.dm
View File

@@ -16,7 +16,7 @@
/obj/item/weapon/ore/bluespace_crystal/attack_self(mob/user) /obj/item/weapon/ore/bluespace_crystal/attack_self(mob/user)
user.visible_message("<span class='warning'>[user] crushes [src]!</span>", "<span class='danger'>You crush [src]!</span>") user.visible_message("<span class='warning'>[user] crushes [src]!</span>", "<span class='danger'>You crush [src]!</span>")
var/datum/effect/effect/system/spark_spread/s = PoolOrNew(/datum/effect/effect/system/spark_spread) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread()
s.set_up(5, 1, get_turf(src)) s.set_up(5, 1, get_turf(src))
s.start() s.start()
blink_mob(user) blink_mob(user)
@@ -30,7 +30,7 @@
if(!..()) // not caught in mid-air if(!..()) // not caught in mid-air
visible_message("<span class='notice'>[src] fizzles and disappears upon impact!</span>") visible_message("<span class='notice'>[src] fizzles and disappears upon impact!</span>")
var/turf/T = get_turf(hit_atom) var/turf/T = get_turf(hit_atom)
var/datum/effect/effect/system/spark_spread/s = PoolOrNew(/datum/effect/effect/system/spark_spread) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread()
s.set_up(5, 1, T) s.set_up(5, 1, T)
s.start() s.start()
if(isliving(hit_atom)) if(isliving(hit_atom))

6
code/modules/telesci/telesci_computer.dm
View File

@@ -128,7 +128,7 @@
/obj/machinery/computer/telescience/proc/sparks() /obj/machinery/computer/telescience/proc/sparks()
if(telepad) if(telepad)
var/datum/effect/effect/system/spark_spread/s = PoolOrNew(/datum/effect/effect/system/spark_spread) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread()
s.set_up(5, 1, get_turf(telepad)) s.set_up(5, 1, get_turf(telepad))
s.start() s.start()
else else
@@ -214,7 +214,7 @@
// use a lot of power // use a lot of power
use_power(trueDistance * 10000) use_power(trueDistance * 10000)
var/datum/effect/effect/system/spark_spread/S = PoolOrNew(/datum/effect/effect/system/spark_spread) var/datum/effect/effect/system/spark_spread/S = new /datum/effect/effect/system/spark_spread()
S.set_up(5, 1, get_turf(telepad)) S.set_up(5, 1, get_turf(telepad))
S.start() S.start()
@@ -229,7 +229,7 @@
temp_msg += "Data printed below." temp_msg += "Data printed below."
var/sparks = get_turf(target) var/sparks = get_turf(target)
var/datum/effect/effect/system/spark_spread/Y = PoolOrNew(/datum/effect/effect/system/spark_spread) var/datum/effect/effect/system/spark_spread/Y = new /datum/effect/effect/system/spark_spread()
Y.set_up(5, 1, sparks) Y.set_up(5, 1, sparks)
Y.start() Y.start()