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

Merge branch 'master' into upstream-merge-28046

Browse Source
This commit is contained in:
LetterJay
2017-06-14 13:10:37 -05:00
committed by GitHub
parent aba07154d0 defb7d75c1
commit c877fdb501
382 changed files with 304519 additions and 166836 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/ruins/lavaland_ruin_code.dm
+5 -3
View File
@@ -132,10 +132,9 @@
roundstart = FALSE
death = FALSE
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "sleeper"
icon_state = "sleeper_s"
flavour_text = "<font size=3>You are a syndicate agent, employed in a top secret research facility developing biological weapons. Unfortunately, your hated enemy, Nanotrasen, has begun mining in this sector. <b>Continue your research as best you can, and try to keep a low profile. Do not abandon the base without good cause.</b> The base is rigged with explosives should the worst happen, do not let the base fall into enemy hands!</b>"
id_access_list = list(GLOB.access_syndicate)
faction = list("syndicate")
outfit = /datum/outfit/lavaland_syndicate
/datum/outfit/lavaland_syndicate
@@ -151,10 +150,13 @@
id = /obj/item/weapon/card/id
implants = list(/obj/item/weapon/implant/weapons_auth)
/datum/outfit/lavaland_syndicate/post_equip(mob/living/carbon/human/H)
H.faction |= "syndicate"
/obj/effect/mob_spawn/human/lavaland_syndicate/comms
name = "Syndicate Comms Agent"
flavour_text = "<font size=3>You are a syndicate agent, employed in a top secret research facility developing biological weapons. Unfortunately, your hated enemy, Nanotrasen, has begun mining in this sector. <b>Monitor enemy activity as best you can, and try to keep a low profile. Do not abandon the base without good cause.</b> Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen off your trail. Do not let the base fall into enemy hands!</b>"
flavour_text = "<font size=3>You are a syndicate agent, employed in a top secret research facility developing biological weapons. Unfortunately, your hated enemy, Nanotrasen, has begun mining in this sector. <b>Monitor enemy activity as best you can, and try to keep a low profile. <font size=6><b>DON'T</b></font> abandon the base without good cause.</b> Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen off your trail. Do not let the base fall into enemy hands!</b>"
outfit = /datum/outfit/lavaland_syndicate/comms
/datum/outfit/lavaland_syndicate/comms
code/modules/ruins/objects_and_mobs/ash_walker_den.dm
+9
View File
@@ -12,6 +12,15 @@
loot = list(/obj/effect/gibspawner, /obj/item/device/assembly/signaler/anomaly)
del_on_death = 1
var/meat_counter
var/obj/effect/light_emitter/tendril/emitted_light
/mob/living/simple_animal/hostile/spawner/ash_walker/Initialize()
. = ..()
emitted_light = new(loc)
/mob/living/simple_animal/hostile/spawner/ash_walker/Destroy()
QDEL_NULL(emitted_light)
. = ..()
/mob/living/simple_animal/hostile/spawner/ash_walker/Life()
..()