diff --git a/code/modules/mob_spawn/ghost_roles/mining_roles.dm b/code/modules/mob_spawn/ghost_roles/mining_roles.dm index dc4eb5ed3e0..0cf5b3b59c0 100644 --- a/code/modules/mob_spawn/ghost_roles/mining_roles.dm +++ b/code/modules/mob_spawn/ghost_roles/mining_roles.dm @@ -49,11 +49,11 @@ return ..() /datum/outfit/hermit - name = "Lavaland hermit" + name = "Lavaland Hermit" uniform = /obj/item/clothing/under/color/grey/ancient - shoes = /obj/item/clothing/shoes/sneakers/black back = /obj/item/storage/backpack mask = /obj/item/clothing/mask/breath + shoes = /obj/item/clothing/shoes/sneakers/black l_pocket = /obj/item/tank/internals/emergency_oxygen r_pocket = /obj/item/flashlight/glowstick @@ -97,11 +97,11 @@ /datum/outfit/beachbum name = "Beach Bum" - glasses = /obj/item/clothing/glasses/sunglasses - r_pocket = /obj/item/storage/wallet/random - l_pocket = /obj/item/food/pizzaslice/dank - uniform = /obj/item/clothing/under/pants/jeans id = /obj/item/card/id/advanced + uniform = /obj/item/clothing/under/pants/jeans + glasses = /obj/item/clothing/glasses/sunglasses + l_pocket = /obj/item/food/pizzaslice/dank + r_pocket = /obj/item/storage/wallet/random /datum/outfit/beachbum/post_equip(mob/living/carbon/human/bum, visualsOnly = FALSE) . = ..() @@ -111,8 +111,8 @@ /datum/outfit/beachbum/lifeguard name = "Beach Lifeguard" - uniform = /obj/item/clothing/under/shorts/red id_trim = /datum/id_trim/lifeguard + uniform = /obj/item/clothing/under/shorts/red /obj/effect/mob_spawn/ghost_role/human/bartender name = "bartender sleeper" @@ -127,13 +127,13 @@ /datum/outfit/spacebartender name = "Space Bartender" - uniform = /obj/item/clothing/under/rank/civilian/bartender - back = /obj/item/storage/backpack - shoes = /obj/item/clothing/shoes/sneakers/black - suit = /obj/item/clothing/suit/armor/vest - glasses = /obj/item/clothing/glasses/sunglasses/reagent id = /obj/item/card/id/advanced id_trim = /datum/id_trim/space_bartender + uniform = /obj/item/clothing/under/rank/civilian/bartender + suit = /obj/item/clothing/suit/armor/vest + back = /obj/item/storage/backpack + glasses = /obj/item/clothing/glasses/sunglasses/reagent + shoes = /obj/item/clothing/shoes/sneakers/black /datum/outfit/spacebartender/post_equip(mob/living/carbon/human/bartender, visualsOnly = FALSE) . = ..() @@ -302,15 +302,17 @@ /datum/outfit/lavaland_syndicate name = "Lavaland Syndicate Agent" - r_hand = /obj/item/gun/ballistic/automatic/sniper_rifle + id = /obj/item/card/id/advanced/chameleon + id_trim = /datum/id_trim/chameleon/operative uniform = /obj/item/clothing/under/syndicate suit = /obj/item/clothing/suit/toggle/labcoat - shoes = /obj/item/clothing/shoes/combat + back = /obj/item/storage/backpack gloves = /obj/item/clothing/gloves/tackler/combat/insulated ears = /obj/item/radio/headset/syndicate/alt - back = /obj/item/storage/backpack + shoes = /obj/item/clothing/shoes/combat r_pocket = /obj/item/gun/ballistic/automatic/pistol - id = /obj/item/card/id/advanced/chameleon + r_hand = /obj/item/gun/ballistic/automatic/sniper_rifle + implants = list(/obj/item/implant/weapons_auth) id_trim = /datum/id_trim/syndicom/skyrat/interdyne //SKYRAT EDIT @@ -323,9 +325,9 @@ /datum/outfit/lavaland_syndicate/comms name = "Lavaland Syndicate Comms Agent" - r_hand = /obj/item/melee/energy/sword/saber - mask = /obj/item/clothing/mask/chameleon/gps suit = /obj/item/clothing/suit/armor/vest + mask = /obj/item/clothing/mask/chameleon/gps + r_hand = /obj/item/melee/energy/sword/saber /obj/item/clothing/mask/chameleon/gps/Initialize(mapload) . = ..() diff --git a/code/modules/mob_spawn/ghost_roles/space_roles.dm b/code/modules/mob_spawn/ghost_roles/space_roles.dm index 397e01534f6..0d81075d969 100644 --- a/code/modules/mob_spawn/ghost_roles/space_roles.dm +++ b/code/modules/mob_spawn/ghost_roles/space_roles.dm @@ -21,11 +21,11 @@ /datum/outfit/oldsec name = "Ancient Security" + id = /obj/item/card/id/away/old/sec uniform = /obj/item/clothing/under/rank/security/officer shoes = /obj/item/clothing/shoes/jackboots - id = /obj/item/card/id/away/old/sec - r_pocket = /obj/item/restraints/handcuffs l_pocket = /obj/item/assembly/flash/handheld + r_pocket = /obj/item/restraints/handcuffs /obj/effect/mob_spawn/ghost_role/human/oldeng name = "old cryogenics pod" @@ -48,10 +48,10 @@ /datum/outfit/oldeng name = "Ancient Engineer" - uniform = /obj/item/clothing/under/rank/engineering/engineer - shoes = /obj/item/clothing/shoes/workboots id = /obj/item/card/id/away/old/eng + uniform = /obj/item/clothing/under/rank/engineering/engineer gloves = /obj/item/clothing/gloves/color/fyellow/old + shoes = /obj/item/clothing/shoes/workboots l_pocket = /obj/item/tank/internals/emergency_oxygen /datum/outfit/oldeng/mod @@ -82,9 +82,9 @@ /datum/outfit/oldsci name = "Ancient Scientist" + id = /obj/item/card/id/away/old/sci uniform = /obj/item/clothing/under/rank/rnd/scientist shoes = /obj/item/clothing/shoes/laceup - id = /obj/item/card/id/away/old/sci l_pocket = /obj/item/stack/medical/bruise_pack ///asteroid comms agent @@ -194,10 +194,11 @@ /datum/outfit/syndicate_empty/battlecruiser name = "Syndicate Battlecruiser Ship Operative" + belt = /obj/item/storage/belt/military/assault l_pocket = /obj/item/gun/ballistic/automatic/pistol/clandestine r_pocket = /obj/item/knife/combat/survival + box = /obj/item/storage/box/survival/syndie - belt = /obj/item/storage/belt/military/assault /obj/effect/mob_spawn/ghost_role/human/syndicate/battlecruiser/assault name = "Syndicate Battlecruiser Assault Operative" @@ -211,13 +212,13 @@ /datum/outfit/syndicate_empty/battlecruiser/assault name = "Syndicate Battlecruiser Assault Operative" uniform = /obj/item/clothing/under/syndicate/combat - l_pocket = /obj/item/uplink/nuclear - r_pocket = /obj/item/modular_computer/pda/nukeops - belt = /obj/item/storage/belt/military suit = /obj/item/clothing/suit/armor/vest suit_store = /obj/item/gun/ballistic/automatic/pistol/clandestine back = /obj/item/storage/backpack + belt = /obj/item/storage/belt/military mask = /obj/item/clothing/mask/gas/syndicate + l_pocket = /obj/item/uplink/nuclear + r_pocket = /obj/item/modular_computer/pda/nukeops /obj/effect/mob_spawn/ghost_role/human/syndicate/battlecruiser/captain name = "Syndicate Battlecruiser Captain" @@ -232,14 +233,14 @@ /datum/outfit/syndicate_empty/battlecruiser/assault/captain name = "Syndicate Battlecruiser Captain" - l_pocket = /obj/item/melee/energy/sword/saber/red - r_pocket = /obj/item/melee/baton/telescopic + id = /obj/item/card/id/advanced/black/syndicate_command/captain_id + id_trim = /datum/id_trim/battlecruiser/captain suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate suit_store = /obj/item/gun/ballistic/revolver/mateba back = /obj/item/storage/backpack/satchel/leather - head = /obj/item/clothing/head/hats/hos/syndicate - mask = /obj/item/clothing/mask/cigarette/cigar/havana ears = /obj/item/radio/headset/syndicate/alt/leader glasses = /obj/item/clothing/glasses/thermal/eyepatch - id = /obj/item/card/id/advanced/black/syndicate_command/captain_id - id_trim = /datum/id_trim/battlecruiser/captain + head = /obj/item/clothing/head/hats/hos/syndicate + mask = /obj/item/clothing/mask/cigarette/cigar/havana + l_pocket = /obj/item/melee/energy/sword/saber/red + r_pocket = /obj/item/melee/baton/telescopic diff --git a/code/modules/mob_spawn/ghost_roles/unused_roles.dm b/code/modules/mob_spawn/ghost_roles/unused_roles.dm index ec6106bf41e..aaa5c33428f 100644 --- a/code/modules/mob_spawn/ghost_roles/unused_roles.dm +++ b/code/modules/mob_spawn/ghost_roles/unused_roles.dm @@ -54,10 +54,14 @@ /datum/outfit/hotelstaff name = "Hotel Staff" uniform = /obj/item/clothing/under/misc/assistantformal + back = /obj/item/storage/backpack shoes = /obj/item/clothing/shoes/laceup r_pocket = /obj/item/radio/off - back = /obj/item/storage/backpack - implants = list(/obj/item/implant/mindshield, /obj/item/implant/exile/noteleport) + + implants = list( + /obj/item/implant/exile/noteleport, + /obj/item/implant/mindshield, + ) /obj/effect/mob_spawn/ghost_role/human/hotel_staff/security name = "hotel security sleeper" @@ -71,11 +75,11 @@ /datum/outfit/hotelstaff/security name = "Hotel Security" uniform = /obj/item/clothing/under/rank/security/officer/blueshirt - shoes = /obj/item/clothing/shoes/jackboots suit = /obj/item/clothing/suit/armor/vest/blueshirt - head = /obj/item/clothing/head/helmet/blueshirt back = /obj/item/storage/backpack/security belt = /obj/item/storage/belt/security/full + head = /obj/item/clothing/head/helmet/blueshirt + shoes = /obj/item/clothing/shoes/jackboots /obj/effect/mob_spawn/ghost_role/human/hotel_staff/Destroy() new/obj/structure/fluff/empty_sleeper/syndicate(get_turf(src)) @@ -93,14 +97,15 @@ /datum/outfit/syndicate_empty name = "Syndicate Operative Empty" - uniform = /obj/item/clothing/under/syndicate - shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/tackler/combat/insulated - ears = /obj/item/radio/headset/syndicate/alt - back = /obj/item/storage/backpack - implants = list(/obj/item/implant/weapons_auth) id = /obj/item/card/id/advanced/chameleon id_trim = /datum/id_trim/chameleon/operative + uniform = /obj/item/clothing/under/syndicate + back = /obj/item/storage/backpack + ears = /obj/item/radio/headset/syndicate/alt + gloves = /obj/item/clothing/gloves/tackler/combat/insulated + shoes = /obj/item/clothing/shoes/combat + + implants = list(/obj/item/implant/weapons_auth) /datum/outfit/syndicate_empty/post_equip(mob/living/carbon/human/H) H.faction |= ROLE_SYNDICATE @@ -125,10 +130,10 @@ /datum/outfit/cryobartender name = "Cryogenic Bartender" uniform = /obj/item/clothing/under/rank/civilian/bartender - back = /obj/item/storage/backpack - shoes = /obj/item/clothing/shoes/sneakers/black suit = /obj/item/clothing/suit/armor/vest + back = /obj/item/storage/backpack glasses = /obj/item/clothing/glasses/sunglasses/reagent + shoes = /obj/item/clothing/shoes/sneakers/black //Timeless prisons: Spawns in Wish Granter prisons in lavaland. Ghosts become age-old users of the Wish Granter and are advised to seek repentance for their past. /obj/effect/mob_spawn/ghost_role/human/exile @@ -241,13 +246,14 @@ /datum/outfit/snowsyndie name = "Syndicate Snow Operative" - uniform = /obj/item/clothing/under/syndicate/coldres - shoes = /obj/item/clothing/shoes/combat/coldres - ears = /obj/item/radio/headset/syndicate/alt - r_pocket = /obj/item/gun/ballistic/automatic/pistol id = /obj/item/card/id/advanced/chameleon - implants = list(/obj/item/implant/exile) id_trim = /datum/id_trim/chameleon/operative + uniform = /obj/item/clothing/under/syndicate/coldres + ears = /obj/item/radio/headset/syndicate/alt + shoes = /obj/item/clothing/shoes/combat/coldres + r_pocket = /obj/item/gun/ballistic/automatic/pistol + + implants = list(/obj/item/implant/exile) //Forgotten syndicate ship @@ -286,13 +292,14 @@ /datum/outfit/syndicatespace name = "Syndicate Ship Base" + id = /obj/item/card/id/advanced/black/syndicate_command/crew_id uniform = /obj/item/clothing/under/syndicate/combat - ears = /obj/item/radio/headset/syndicate/alt - shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat back = /obj/item/storage/backpack belt = /obj/item/storage/belt/military/assault - id = /obj/item/card/id/advanced/black/syndicate_command/crew_id + ears = /obj/item/radio/headset/syndicate/alt + gloves = /obj/item/clothing/gloves/combat + shoes = /obj/item/clothing/shoes/combat + implants = list(/obj/item/implant/weapons_auth) /datum/outfit/syndicatespace/post_equip(mob/living/carbon/human/syndie_scum) @@ -307,10 +314,14 @@ /datum/outfit/syndicatespace/syndicaptain name = "Syndicate Ship Captain" + id = /obj/item/card/id/advanced/black/syndicate_command/captain_id uniform = /obj/item/clothing/under/syndicate/combat suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate - head = /obj/item/clothing/head/hats/hos/beret/syndicate ears = /obj/item/radio/headset/syndicate/alt/leader + head = /obj/item/clothing/head/hats/hos/beret/syndicate r_pocket = /obj/item/knife/combat/survival - id = /obj/item/card/id/advanced/black/syndicate_command/captain_id - backpack_contents = list(/obj/item/documents/syndicate/red, /obj/item/paper/fluff/ruins/forgottenship/password, /obj/item/gun/ballistic/automatic/pistol/aps) + backpack_contents = list( + /obj/item/documents/syndicate/red, + /obj/item/gun/ballistic/automatic/pistol/aps, + /obj/item/paper/fluff/ruins/forgottenship/password, + )