diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index fc29206090..fbfc36cd97 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -396,7 +396,6 @@ death = FALSE icon = 'icons/obj/machines/sleeper.dmi' icon_state = "sleeper_s" - id_access_list = list(ACCESS_SYNDICATE) outfit = /datum/outfit/syndicate_empty assignedrole = "Space Syndicate" //I know this is really dumb, but Syndicate operative is nuke ops @@ -408,7 +407,7 @@ ears = /obj/item/device/radio/headset/syndicate/alt back = /obj/item/storage/backpack implants = list(/obj/item/implant/weapons_auth) - id = /obj/item/card/id + id = /obj/item/card/id/syndicate /datum/outfit/syndicate_empty/post_equip(mob/living/carbon/human/H) H.faction |= ROLE_SYNDICATE diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm index 75530c5751..707f004eb1 100644 --- a/code/modules/awaymissions/mission_code/snowdin.dm +++ b/code/modules/awaymissions/mission_code/snowdin.dm @@ -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 diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index 60779aeaac..b6f9e1e9b8 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -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 diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 57dda3b39c..7d48b5eaac 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -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 diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm index becb7abf1d..de7dd1d8ee 100644 --- a/code/modules/ruins/lavaland_ruin_code.dm +++ b/code/modules/ruins/lavaland_ruin_code.dm @@ -99,7 +99,6 @@ icon = 'icons/obj/machines/sleeper.dmi' icon_state = "sleeper_s" 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. DON'T 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(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,14 @@ r_hand = /obj/item/melee/transforming/energy/sword/saber mask = /obj/item/clothing/mask/chameleon suit = /obj/item/clothing/suit/armor/vest +<<<<<<< HEAD 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" +>>>>>>> 47ed29c... Merge pull request #35514 from ShizCalev/ghost-role-syndi-access