shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5064 from Citadel-Station-13/upstream-merge-34783

Browse Source 
[MIRROR] Cleans up duplicated code and GC issues
This commit is contained in:
LetterJay
2018-01-24 13:59:44 -06:00
committed by GitHub
parent 937d6c473a 2be6577e63
commit 9652fc4127
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/mob/living/simple_animal/hostile/pirate.dm
View File

@@ -35,6 +35,10 @@
. = ..()
sord = new(src)
/mob/living/simple_animal/hostile/pirate/Destroy()
QDEL_NULL(sord)
return ..()
/mob/living/simple_animal/hostile/pirate/ranged
name = "Pirate Gunner"
icon_state = "pirateranged"
@@ -59,7 +63,6 @@
/mob/living/simple_animal/hostile/pirate/space/Initialize()
. = ..()
sord = new(src)
set_light(3)
/mob/living/simple_animal/hostile/pirate/space/ranged
@@ -74,8 +77,3 @@
projectiletype = /obj/item/projectile/beam/laser
loot = list(/obj/effect/mob_spawn/human/corpse/pirate/ranged,
/obj/item/gun/energy/laser)
/mob/living/simple_animal/hostile/pirate/space/ranged/Initialize()
. = ..()
set_light(3)

15
code/modules/mob/living/simple_animal/hostile/syndicate.dm
View File

@@ -45,7 +45,6 @@
check_friendly_fire = 1
status_flags = CANPUSH
del_on_death = 1
var/obj/effect/light_emitter/red_energy_sword/sord
///////////////Sword and shield////////////
@@ -86,12 +85,17 @@
name = "Syndicate Commando"
loot = list(/obj/effect/gibspawner/human)
speed = 1
var/obj/effect/light_emitter/red_energy_sword/sord
/mob/living/simple_animal/hostile/syndicate/melee/space/Initialize()
. = ..()
sord = new(src)
set_light(4)
/mob/living/simple_animal/hostile/syndicate/melee/space/Destroy()
QDEL_NULL(sord)
return ..()
/mob/living/simple_animal/hostile/syndicate/melee/space/stormtrooper
icon_state = "syndicatemeleestormtrooper"
icon_living = "syndicatemeleestormtrooper"
@@ -100,11 +104,6 @@
health = 340
loot = list(/obj/effect/gibspawner/human)
/mob/living/simple_animal/hostile/syndicate/melee/space/stormtrooper/Initialize()
. = ..()
sord = new(src)
set_light(4)
///////////////Guns////////////
/mob/living/simple_animal/hostile/syndicate/ranged
@@ -142,10 +141,6 @@
casingtype = /obj/item/ammo_casing/shotgun/buckshot
loot = list(/obj/effect/gibspawner/human)
/mob/living/simple_animal/hostile/syndicate/ranged/space/stormtrooper/Initialize()
. = ..()
set_light(4)
///////////////Misc////////////
/mob/living/simple_animal/hostile/syndicate/civilian