Merge pull request #5430 from Citadel-Station-13/upstream-merge-35514

[MIRROR] Fixes wrong ID for syndicate ghost roles
This commit is contained in:
LetterJay
2018-02-12 10:01:42 -06:00
committed by GitHub
5 changed files with 13 additions and 13 deletions
@@ -603,7 +603,7 @@
shoes = /obj/item/clothing/shoes/combat/coldres
ears = /obj/item/device/radio/headset/syndicate/alt
r_pocket = /obj/item/gun/ballistic/automatic/pistol
l_pocket = /obj/item/card/id/syndicate
id = /obj/item/card/id/syndicate
implants = list(/obj/item/implant/exile)
/obj/effect/mob_spawn/human/syndicatesoldier/coldres/alive/female
@@ -11,7 +11,6 @@
/obj/effect/mob_spawn/human/corpse/syndicatesoldier
name = "Syndicate Operative"
id_job = "Operative"
id_access_list = list(ACCESS_SYNDICATE)
hair_style = "Bald"
facial_hair_style = "Shaved"
outfit = /datum/outfit/syndicatesoldiercorpse
@@ -26,13 +25,12 @@
mask = /obj/item/clothing/mask/gas
head = /obj/item/clothing/head/helmet/swat
back = /obj/item/storage/backpack
id = /obj/item/card/id
id = /obj/item/card/id/syndicate
/obj/effect/mob_spawn/human/corpse/syndicatecommando
name = "Syndicate Commando"
id_job = "Operative"
id_access_list = list(ACCESS_SYNDICATE)
hair_style = "Bald"
facial_hair_style = "Shaved"
outfit = /datum/outfit/syndicatecommandocorpse
@@ -47,13 +45,12 @@
mask = /obj/item/clothing/mask/gas/syndicate
back = /obj/item/tank/jetpack/oxygen
r_pocket = /obj/item/tank/internals/emergency_oxygen
id = /obj/item/card/id
id = /obj/item/card/id/syndicate
/obj/effect/mob_spawn/human/corpse/syndicatestormtrooper
name = "Syndicate Stormtrooper"
id_job = "Operative"
id_access_list = list(ACCESS_SYNDICATE)
hair_style = "Bald"
facial_hair_style = "Shaved"
outfit = /datum/outfit/syndicatestormtroopercorpse
@@ -67,7 +64,7 @@
ears = /obj/item/device/radio/headset
mask = /obj/item/clothing/mask/gas/syndicate
back = /obj/item/tank/jetpack/oxygen/harness
id = /obj/item/card/id
id = /obj/item/card/id/syndicate
/obj/effect/mob_spawn/human/clown/corpse
@@ -346,7 +346,6 @@
mask = /obj/item/clothing/mask/breath
if("Operative")
id_job = "Operative"
id_access_list = list(ACCESS_SYNDICATE)
outfit = /datum/outfit/syndicatecommandocorpse
if("Shadow")
mob_species = /datum/species/shadow
+8 -3
View File
@@ -99,7 +99,6 @@
icon = 'icons/obj/machines/sleeper.dmi'
icon_state = "sleeper_s"
flavour_text = "<span class='big bold'>You are a syndicate agent,</span><b> 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. <font size=6>DON'T</font> 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(ACCESS_SYNDICATE)
outfit = /datum/outfit/lavaland_syndicate
assignedrole = "Lavaland Syndicate"
@@ -116,7 +115,7 @@
ears = /obj/item/device/radio/headset/syndicate/alt
back = /obj/item/storage/backpack
r_pocket = /obj/item/gun/ballistic/automatic/pistol
id = /obj/item/card/id
id = /obj/item/card/id/syndicate/anyone
implants = list(/obj/item/implant/weapons_auth)
/datum/outfit/lavaland_syndicate/post_equip(mob/living/carbon/human/H)
@@ -138,4 +137,10 @@
r_hand = /obj/item/melee/transforming/energy/sword/saber
mask = /obj/item/clothing/mask/chameleon
suit = /obj/item/clothing/suit/armor/vest
l_pocket = /obj/item/card/id/syndicate/anyone
/obj/item/clothing/mask/chameleon/gps/Initialize()
. = ..()
new /obj/item/device/gps/internal/lavaland_syndicate_base(src)
/obj/item/device/gps/internal/lavaland_syndicate_base
gpstag = "Encrypted Signal"