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

Merge pull request #5005 from Citadel-Station-13/upstream-merge-34720

Browse Source 
[MIRROR] Syndicate+Pirate mobs now give off light if appropriate
This commit is contained in:
LetterJay
2018-01-21 23:10:57 -06:00
committed by GitHub
parent 9a96950032 841bf18c6b
commit 1beea71328
2 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/hostile/pirate.dm
+14
View File
@@ -29,6 +29,11 @@
/obj/item/melee/transforming/energy/sword/pirate)
del_on_death = 1
faction = list("pirate")
var/obj/effect/light_emitter/red_energy_sword/sord
/mob/living/simple_animal/hostile/pirate/Initialize()
. = ..()
sord = new(src)
/mob/living/simple_animal/hostile/pirate/ranged
name = "Pirate Gunner"
@@ -52,6 +57,11 @@
minbodytemp = 0
speed = 1
/mob/living/simple_animal/hostile/pirate/space/Initialize()
. = ..()
sord = new(src)
set_light(3)
/mob/living/simple_animal/hostile/pirate/space/ranged
name = "Space Pirate Gunner"
icon_state = "piratespaceranged"
@@ -65,3 +75,7 @@
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)
code/modules/mob/living/simple_animal/hostile/syndicate.dm
+29
View File
@@ -8,6 +8,11 @@
///////////////Base mob////////////
/obj/effect/light_emitter/red_energy_sword //used so there's a combination of both their head light and light coming off the energy sword
set_luminosity = 2
set_cap = 2.5
light_color = LIGHT_COLOR_RED
/mob/living/simple_animal/hostile/syndicate
name = "Syndicate Operative"
@@ -40,6 +45,7 @@
check_friendly_fire = 1
status_flags = CANPUSH
del_on_death = 1
var/obj/effect/light_emitter/red_energy_sword/sord
///////////////Sword and shield////////////
@@ -52,11 +58,16 @@
attacktext = "slashes"
attack_sound = 'sound/weapons/bladeslice.ogg'
armour_penetration = 28
light_color = LIGHT_COLOR_RED
status_flags = 0
maxHealth = 170
health = 170
spacewalk = TRUE
/mob/living/simple_animal/hostile/syndicate/melee/Initialize()
. = ..()
set_light(2)
/mob/living/simple_animal/hostile/syndicate/melee/bullet_act(obj/item/projectile/Proj)
if(!Proj)
return
@@ -76,6 +87,11 @@
loot = list(/obj/effect/gibspawner/human)
speed = 1
/mob/living/simple_animal/hostile/syndicate/melee/space/Initialize()
. = ..()
sord = new(src)
set_light(4)
/mob/living/simple_animal/hostile/syndicate/melee/space/stormtrooper
icon_state = "syndicatemeleestormtrooper"
icon_living = "syndicatemeleestormtrooper"
@@ -84,6 +100,11 @@
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
@@ -107,6 +128,10 @@
spacewalk = TRUE
loot = list(/obj/effect/gibspawner/human)
/mob/living/simple_animal/hostile/syndicate/ranged/space/Initialize()
. = ..()
set_light(4)
/mob/living/simple_animal/hostile/syndicate/ranged/space/stormtrooper
icon_state = "syndicaterangedstormtrooper"
icon_living = "syndicaterangedstormtrooper"
@@ -117,6 +142,10 @@
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