From 5073d8e6f2b731544dce4ed4e244a205e92f88f3 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 30 May 2017 16:43:09 -0500 Subject: [PATCH] rej --- code/modules/ruins/lavaland_ruin_code.dm.rej | 52 -------------------- 1 file changed, 52 deletions(-) delete mode 100644 code/modules/ruins/lavaland_ruin_code.dm.rej 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 923803db54..0000000000 --- a/code/modules/ruins/lavaland_ruin_code.dm.rej +++ /dev/null @@ -1,52 +0,0 @@ -diff a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm (rejected hunks) -@@ -126,29 +126,39 @@ - shell_type = /obj/effect/mob_spawn/human/golem/servant - - ///Syndicate Listening Post -+ - /obj/effect/mob_spawn/human/lavaland_syndicate -- r_hand = /obj/item/weapon/gun/ballistic/automatic/sniper_rifle - name = "Syndicate Bioweapon Scientist" -- uniform = /obj/item/clothing/under/syndicate -- suit = /obj/item/clothing/suit/toggle/labcoat -- shoes = /obj/item/clothing/shoes/combat -- gloves = /obj/item/clothing/gloves/combat -- radio = /obj/item/device/radio/headset/syndicate/alt -- back = /obj/item/weapon/storage/backpack -- pocket1 = /obj/item/weapon/gun/ballistic/automatic/pistol - roundstart = FALSE - death = FALSE - 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) - faction = list("syndicate") -+ outfit = /datum/outfit/lavaland_syndicate -+ -+/datum/outfit/lavaland_syndicate -+ name = "Lavaland Syndicate Agent" -+ r_hand = /obj/item/weapon/gun/ballistic/automatic/sniper_rifle -+ uniform = /obj/item/clothing/under/syndicate -+ suit = /obj/item/clothing/suit/toggle/labcoat -+ shoes = /obj/item/clothing/shoes/combat -+ gloves = /obj/item/clothing/gloves/combat -+ ears = /obj/item/device/radio/headset/syndicate/alt -+ back = /obj/item/weapon/storage/backpack -+ r_pocket = /obj/item/weapon/gun/ballistic/automatic/pistol -+ id = /obj/item/weapon/card/id -+ - - /obj/effect/mob_spawn/human/lavaland_syndicate/comms - name = "Syndicate Comms Agent" -+ 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!" -+ outfit = /datum/outfit/lavaland_syndicate/comms -+ -+/datum/outfit/lavaland_syndicate/comms -+ name = "Lavaland 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 -+ l_pocket = /obj/item/weapon/card/id/syndicate/anyone