cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26386 from ChangelingRain/initialnew

Browse Source 
New() goes in the trash, we've gotta Initialize()
This commit is contained in:
oranges
2017-04-27 10:15:10 +12:00
committed by GitHub
parent 379787fe86 228df13447
commit d95e859e5d
64 changed files with 246 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/projectile/special.dm
+14 -11
View File
@@ -204,7 +204,8 @@
dismemberment = 20
impact_effect_type = /obj/effect/overlay/temp/impact_effect/purple_laser
/obj/item/projectile/plasma/New()
/obj/item/projectile/plasma/Initialize()
. = ..()
var/turf/proj_turf = get_turf(src)
if(!isturf(proj_turf))
return
@@ -215,7 +216,6 @@
name = "full strength [name]"
damage *= 4
range *= 2
..()
/obj/item/projectile/plasma/on_hit(atom/target)
. = ..()
@@ -254,9 +254,10 @@
var/power = 4
var/list/thrown_items = list()
/obj/item/projectile/gravityrepulse/New(var/obj/item/ammo_casing/energy/gravityrepulse/C)
..()
if(C) //Hard-coded maximum power so servers can't be crashed by trying to throw the entire Z level's items
/obj/item/projectile/gravityrepulse/Initialize()
. = ..()
var/obj/item/ammo_casing/energy/gravityrepulse/C = loc
if(istype(C)) //Hard-coded maximum power so servers can't be crashed by trying to throw the entire Z level's items
power = min(C.gun.power, 15)
/obj/item/projectile/gravityrepulse/on_hit()
@@ -284,9 +285,10 @@
var/power = 4
var/list/thrown_items = list()
/obj/item/projectile/gravityattract/New(var/obj/item/ammo_casing/energy/gravityattract/C)
..()
if(C) //Hard-coded maximum power so servers can't be crashed by trying to throw the entire Z level's items
/obj/item/projectile/gravityattract/Initialize()
. = ..()
var/obj/item/ammo_casing/energy/gravityattract/C = loc
if(istype(C)) //Hard-coded maximum power so servers can't be crashed by trying to throw the entire Z level's items
power = min(C.gun.power, 15)
/obj/item/projectile/gravityattract/on_hit()
@@ -313,9 +315,10 @@
var/power = 4
var/list/thrown_items = list()
/obj/item/projectile/gravitychaos/New(var/obj/item/ammo_casing/energy/gravitychaos/C)
..()
if(C) //Hard-coded maximum power so servers can't be crashed by trying to throw the entire Z level's items
/obj/item/projectile/gravitychaos/Initialize()
. = ..()
var/obj/item/ammo_casing/energy/gravitychaos/C = loc
if(istype(C)) //Hard-coded maximum power so servers can't be crashed by trying to throw the entire Z level's items
power = min(C.gun.power, 15)
/obj/item/projectile/gravitychaos/on_hit()