diff --git a/code/modules/ruins/lavaland_ruin_code.dm.rej b/code/modules/ruins/lavaland_ruin_code.dm.rej deleted file mode 100644 index 2f25515493..0000000000 --- a/code/modules/ruins/lavaland_ruin_code.dm.rej +++ /dev/null @@ -1,18 +0,0 @@ -diff a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm (rejected hunks) -@@ -136,16 +135,13 @@ - icon = 'icons/obj/Cryogenic2.dmi' - icon_state = "sleeper" - has_id = 1 -- - flavour_text = "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. Continue your research as best you can, and try to keep a low profile. Do not abandon the base without good cause. The base is rigged with explosives should the worst happen, do not let the base fall into enemy hands!" - id_access_list = list(GLOB.access_syndicate) - -- - /obj/effect/mob_spawn/human/lavaland_syndicate/comms - name = "Syndicate Comms Agent" - r_hand = /obj/item/weapon/melee/energy/sword/saber - mask = /obj/item/clothing/mask/chameleon - suit = /obj/item/clothing/suit/armor/vest - flavour_text = "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. Monitor enemy activity as best you can, and try to keep a low profile. Do not abandon the base without good cause. 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!" -- - pocket2 = /obj/item/weapon/card/id/syndicate/anyone