cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-19 03:49:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Outfits objectified (#18611)

Browse Source 
* oof

* ugh

* fqewavdf

* 4ryh

---------

Co-authored-by: DreamySkrell <>
This commit is contained in:
DreamySkrell
2024-03-10 12:33:32 +01:00
committed by GitHub
parent 8e1a81f81a
commit 85d27eb1d0
168 changed files with 1342 additions and 1253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystems/job.dm
+1 -1
View File
@@ -909,7 +909,7 @@ SUBSYSTEM_DEF(jobs)
var/uniform = job.get_outfit(H)
if(!uniform) // silicons don't have uniforms or gear
return
var/datum/outfit/U = new uniform
var/obj/outfit/U = new uniform
var/spawned_uniform = FALSE
var/spawned_suit = FALSE
for(var/item in prefs.gear)
code/controllers/subsystems/virtual_reality.dm
+2 -2
View File
@@ -260,8 +260,8 @@ SUBSYSTEM_DEF(virtualreality)
H.real_name = user.real_name
H.UpdateAppearance()
H.preEquipOutfit(/datum/outfit/admin/virtual_reality, FALSE)
H.equipOutfit(/datum/outfit/admin/virtual_reality, FALSE)
H.preEquipOutfit(/obj/outfit/admin/virtual_reality, FALSE)
H.equipOutfit(/obj/outfit/admin/virtual_reality, FALSE)
mind_transfer(user, H)
to_chat(H, SPAN_NOTICE("You are now in control of a virtual reality body. Dying will return you to your original body."))
code/datums/outfits/ert/ap_eridani.dm
+6 -6
View File
@@ -1,4 +1,4 @@
/datum/outfit/admin/ert/ap_eridani
/obj/outfit/admin/ert/ap_eridani
name = "Eridani Asset Protection Specialist"
uniform = /obj/item/clothing/under/rank/security/pmc/epmc
@@ -39,10 +39,10 @@
id_iff = IFF_ERIDANI
/datum/outfit/admin/ert/ap_eridani/get_id_access()
/obj/outfit/admin/ert/ap_eridani/get_id_access()
return get_distress_access()
/datum/outfit/admin/ert/ap_eridani/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/ert/ap_eridani/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
@@ -56,7 +56,7 @@
var/obj/item/clothing/shoes/jackboots/toeless/shoes = new(src)
H.equip_to_slot_if_possible(shoes, slot_shoes)
/datum/outfit/admin/ert/ap_eridani/lead
/obj/outfit/admin/ert/ap_eridani/lead
name = "Eridani Section Leader"
uniform = /obj/item/clothing/under/rank/security/pmc/epmc/alt
@@ -82,7 +82,7 @@
/obj/item/melee/telebaton = 1
)
/datum/outfit/admin/ert/ap_eridani/doctor
/obj/outfit/admin/ert/ap_eridani/doctor
name = "Eridani Medical Officer"
uniform = /obj/item/clothing/under/rank/medical/first_responder/pmc/epmc
@@ -126,7 +126,7 @@
/obj/item/storage/pill_bottle/mortaphenyl = 1
)
/datum/outfit/admin/ert/ap_eridani/corpsman
/obj/outfit/admin/ert/ap_eridani/corpsman
name = "Eridani Corpsman"
uniform = /obj/item/clothing/under/rank/medical/first_responder/pmc/epmc
code/datums/outfits/ert/coalition.dm
+11 -11
View File
@@ -1,4 +1,4 @@
/datum/outfit/admin/ert/coalition
/obj/outfit/admin/ert/coalition
name = "Coalition Ranger ERT"
uniform = /obj/item/clothing/under/tactical
shoes = /obj/item/clothing/shoes/magboots
@@ -23,10 +23,10 @@
accessory = /obj/item/clothing/accessory/holster/hip/brown
accessory_contents = list(/obj/item/gun/projectile/colt = 1)
/datum/outfit/admin/ert/coalition/get_id_access()
/obj/outfit/admin/ert/coalition/get_id_access()
return list(ACCESS_DISTRESS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_COALITION, ACCESS_COALITION_NAVY)
/datum/outfit/admin/ert/coalition/medic
/obj/outfit/admin/ert/coalition/medic
name = "Coalition Medic"
belt = /obj/item/storage/belt/medical/first_responder/combat
back = /obj/item/storage/backpack/satchel/med
@@ -55,7 +55,7 @@
/obj/item/reagent_containers/glass/bottle/perconol = 1
)
/datum/outfit/admin/ert/coalition/sapper
/obj/outfit/admin/ert/coalition/sapper
name = "Coalition Sapper"
back = /obj/item/storage/backpack/duffel/eng
belt = /obj/item/storage/belt/utility/very_full
@@ -72,7 +72,7 @@
belt_contents = null
/datum/outfit/admin/ert/coalition/leader
/obj/outfit/admin/ert/coalition/leader
name = "Coalition Team Leader"
head = null
suit = null
@@ -90,7 +90,7 @@
/obj/item/grenade/flashbang = 1
)
/datum/outfit/admin/ert/konyang
/obj/outfit/admin/ert/konyang
name = "KASF Emergency Responder"
uniform = /obj/item/clothing/under/rank/konyang/space
suit = /obj/item/clothing/suit/space/void/sol/konyang
@@ -116,15 +116,15 @@
/obj/item/melee/energy/sword/knife/sol = 1
)
/datum/outfit/admin/ert/konyang/get_id_access()
/obj/outfit/admin/ert/konyang/get_id_access()
return list(ACCESS_DISTRESS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_COALITION, ACCESS_COALITION_NAVY, ACCESS_KONYANG_POLICE)
/datum/outfit/admin/ert/konyang/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/ert/konyang/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(H.isSynthetic())
H.equip_to_slot_or_del(new /obj/item/device/suit_cooling_unit(H), slot_back)
/datum/outfit/admin/ert/konyang/medic
/obj/outfit/admin/ert/konyang/medic
name = "KASF Medic"
belt = /obj/item/storage/belt/medical/first_responder/combat
back = /obj/item/storage/backpack/satchel/med
@@ -153,7 +153,7 @@
/obj/item/melee/energy/sword/knife/sol = 1
)
/datum/outfit/admin/ert/konyang/sapper
/obj/outfit/admin/ert/konyang/sapper
name = "KASF Sapper"
back = /obj/item/storage/backpack/industrial
belt = /obj/item/storage/belt/utility/very_full
@@ -174,6 +174,6 @@
belt_contents = null
/datum/outfit/admin/ert/konyang/leader
/obj/outfit/admin/ert/konyang/leader
name = "KASF Officer"
uniform = /obj/item/clothing/under/rank/konyang/space/officer
code/datums/outfits/ert/deathsquad.dm
+4 -4
View File
@@ -1,4 +1,4 @@
/datum/outfit/admin/deathsquad
/obj/outfit/admin/deathsquad
name = "Asset Protection"
uniform = /obj/item/clothing/under/ert
@@ -27,16 +27,16 @@
id_iff = IFF_DEATHSQUAD
/datum/outfit/admin/deathsquad/leader
/obj/outfit/admin/deathsquad/leader
name = "Asset Protection Lead"
l_pocket = /obj/item/pinpointer
r_hand = /obj/item/device/orbital_dropper/icarus_drones
/datum/outfit/admin/deathsquad/get_id_access()
/obj/outfit/admin/deathsquad/get_id_access()
return get_all_accesses()
/datum/outfit/admin/deathsquad/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/deathsquad/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
code/datums/outfits/ert/elyra.dm
+6 -6
View File
@@ -1,4 +1,4 @@
/datum/outfit/admin/ert/elyran_trooper
/obj/outfit/admin/ert/elyran_trooper
name = "Elyran Navy Crewman"
uniform = /obj/item/clothing/under/rank/elyran_fatigues
@@ -28,10 +28,10 @@
accessory = /obj/item/clothing/accessory/holster/hip/brown
accessory_contents = list(/obj/item/gun/projectile/sec/lethal = 1)
/datum/outfit/admin/ert/elyran_trooper/get_id_access()
/obj/outfit/admin/ert/elyran_trooper/get_id_access()
return get_distress_access()
/datum/outfit/admin/ert/elyran_trooper/leader
/obj/outfit/admin/ert/elyran_trooper/leader
name = "Elyran Navy Officer"
uniform = /obj/item/clothing/under/rank/elyran_fatigues/commander
@@ -47,7 +47,7 @@
l_hand = /obj/item/gun/projectile/plasma
/datum/outfit/admin/ert/elyran_trooper/engineer
/obj/outfit/admin/ert/elyran_trooper/engineer
name = "Elyran Navy Engineer"
back = /obj/item/storage/backpack/duffel/eng
@@ -62,7 +62,7 @@
belt_contents = null
/datum/outfit/admin/ert/elyran_trooper/medical
/obj/outfit/admin/ert/elyran_trooper/medical
name = "Elyran Navy Corpsman"
belt = /obj/item/storage/belt/medical/first_responder/combat
@@ -92,7 +92,7 @@
/obj/item/reagent_containers/glass/bottle/perconol = 1
)
/datum/outfit/admin/ert/elyran_trooper/heavy
/obj/outfit/admin/ert/elyran_trooper/heavy
name = "Elyran Navy Heavy Specialist"
head = null
code/datums/outfits/ert/fsf.dm
+6 -6
View File
@@ -1,4 +1,4 @@
/datum/outfit/admin/ert/fsf
/obj/outfit/admin/ert/fsf
name = "Free Solarian Fleets Marine"
uniform = /obj/item/clothing/under/rank/sol/marine
@@ -30,10 +30,10 @@
id_iff = IFF_FSF
/datum/outfit/admin/ert/fsf/get_id_access()
/obj/outfit/admin/ert/fsf/get_id_access()
return get_distress_access_lesser()
/datum/outfit/admin/ert/fsf/medic
/obj/outfit/admin/ert/fsf/medic
name = "Free Solarian Fleets Medic"
belt = /obj/item/storage/belt/medical/first_responder/combat
@@ -65,7 +65,7 @@
/obj/item/reagent_containers/glass/bottle/perconol = 1
)
/datum/outfit/admin/ert/fsf/sapper
/obj/outfit/admin/ert/fsf/sapper
name = "Free Solarian Fleets Sapper"
back = /obj/item/storage/backpack/industrial
@@ -90,7 +90,7 @@
belt_contents = null
/datum/outfit/admin/ert/fsf/leader
/obj/outfit/admin/ert/fsf/leader
name = "Free Solarian Fleets Fireteam Leader"
l_hand = /obj/item/gun/projectile/automatic/rifle/sol
r_hand = null
@@ -108,7 +108,7 @@
/obj/item/handcuffs/ziptie = 2
)
/datum/outfit/admin/ert/fsf/synth
/obj/outfit/admin/ert/fsf/synth
name = "Free Solarian Fleets Synthetic Unit"
uniform = /obj/item/clothing/under/rank/sol
code/datums/outfits/ert/hephaestus_ert.dm
+5 -5
View File
@@ -1,4 +1,4 @@
/datum/outfit/admin/ert/hephaestus
/obj/outfit/admin/ert/hephaestus
name = "Hephaestus Asset Protection"
uniform = /obj/item/clothing/under/rank/security/heph
shoes = /obj/item/clothing/shoes/magboots
@@ -32,10 +32,10 @@
id_iff = IFF_HEPH
/datum/outfit/admin/ert/hephaestus/get_id_access()
/obj/outfit/admin/ert/hephaestus/get_id_access()
return get_distress_access()
/datum/outfit/admin/ert/hephaestus/medic
/obj/outfit/admin/ert/hephaestus/medic
name = "Hephaestus Medic"
belt = /obj/item/storage/belt/medical/first_responder/combat
glasses = /obj/item/clothing/glasses/hud/health
@@ -69,7 +69,7 @@
/obj/item/reagent_containers/glass/bottle/perconol = 1
)
/datum/outfit/admin/ert/hephaestus/engi
/obj/outfit/admin/ert/hephaestus/engi
name = "Hephaestus Engineer"
back = /obj/item/storage/backpack/duffel/heph
belt = /obj/item/storage/belt/utility/very_full
@@ -90,6 +90,6 @@
)
belt_contents = null
/datum/outfit/admin/ert/hephaestus/leader
/obj/outfit/admin/ert/hephaestus/leader
name = "Hephaestus Squad Leader"
uniform = /obj/item/clothing/under/rank/captain/hephaestus
code/datums/outfits/ert/iac.dm
+5 -5
View File
@@ -1,4 +1,4 @@
/datum/outfit/admin/ert/iac
/obj/outfit/admin/ert/iac
name = "IAC Doctor"
uniform = /obj/item/clothing/under/rank/iacjumpsuit
@@ -38,10 +38,10 @@
id_iff = IFF_IAC
/datum/outfit/admin/ert/iac/get_id_access()
/obj/outfit/admin/ert/iac/get_id_access()
return get_distress_access()
/datum/outfit/admin/iac/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/iac/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
@@ -55,7 +55,7 @@
var/obj/item/clothing/shoes/footwraps = new(src)
H.equip_to_slot_if_possible(footwraps, slot_shoes)
/datum/outfit/admin/ert/iac/bodyguard
/obj/outfit/admin/ert/iac/bodyguard
name = "IAC Bodyguard"
accessory = /obj/item/clothing/accessory/storage/black_vest
@@ -85,7 +85,7 @@
/obj/item/device/flashlight/flare = 1
)
/datum/outfit/admin/ert/iac/paramedic
/obj/outfit/admin/ert/iac/paramedic
name = "IAC Paramedic"
head = /obj/item/clothing/head/helmet/iachelmet
code/datums/outfits/ert/kataphract.dm
+9 -9
View File
@@ -1,4 +1,4 @@
/datum/outfit/admin/ert/kataphract
/obj/outfit/admin/ert/kataphract
name = "Kataphract-Hopeful"
uniform = /obj/item/clothing/under/unathi
@@ -28,7 +28,7 @@
id_iff = IFF_KATAPHRACT
/datum/outfit/admin/ert/kataphract/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/ert/kataphract/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H?.w_uniform)
H.w_uniform.color = pick("#42b360", "#b68029", "#5574c2")
H.w_uniform.accent_color = H.w_uniform.color
@@ -36,10 +36,10 @@
var/obj/item/clothing/shoes/magboots/hegemony/boots = new(H)
H.equip_to_slot_if_possible(boots, slot_shoes)
/datum/outfit/admin/ert/kataphract/get_id_access()
/obj/outfit/admin/ert/kataphract/get_id_access()
return get_distress_access()
/datum/outfit/admin/ert/kataphract/klax
/obj/outfit/admin/ert/kataphract/klax
name = "Kataphract-Hopeful Klax"
uniform = /obj/item/clothing/under/vaurca
@@ -61,7 +61,7 @@
/obj/item/reagent_containers/food/snacks/koisbar_clean = 3
)
/datum/outfit/admin/ert/kataphract/klax/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/ert/kataphract/klax/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H?.wear_mask && H.species.has_organ[BP_PHORON_RESERVE])
var/obj/item/organ/internal/vaurca/preserve/preserve = H.internal_organs_by_name[BP_PHORON_RESERVE]
H.internal = preserve
@@ -80,7 +80,7 @@
A.replaced(H, affected)
H.update_body()
/datum/outfit/admin/ert/kataphract/specialist
/obj/outfit/admin/ert/kataphract/specialist
name = "Kataphract-Hopeful Spec."
head = /obj/item/clothing/head/helmet/space/void/kataphract/spec
@@ -109,21 +109,21 @@
/obj/item/reagent_containers/hypospray/autoinjector/coagzolug = 1
)
/datum/outfit/admin/ert/kataphract/specialist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/ert/kataphract/specialist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H?.w_uniform)
H.w_uniform.color = pick("#42b360", "#b68029", "#5574c2")
if(H?.shoes)
var/obj/item/clothing/shoes/magboots/hegemony/boots = new(H)
H.equip_to_slot_if_possible(boots, slot_shoes)
/datum/outfit/admin/ert/kataphract/leader
/obj/outfit/admin/ert/kataphract/leader
name = "Kataphract Knight"
head = /obj/item/clothing/head/helmet/space/void/kataphract/lead
suit = /obj/item/clothing/suit/space/void/kataphract/lead
glasses = /obj/item/clothing/glasses/thermal
/datum/outfit/admin/ert/kataphract/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/ert/kataphract/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H?.w_uniform)
H.w_uniform.color = pick("#42b360", "#b68029", "#5574c2")
if(H?.shoes)
code/datums/outfits/ert/kosmostrelki.dm
+8 -8
View File
@@ -1,4 +1,4 @@
/datum/outfit/admin/ert/pra_cosmonaut
/obj/outfit/admin/ert/pra_cosmonaut
name = "Kosmostrelki Trooper"
id = /obj/item/card/id/ert
@@ -23,10 +23,10 @@
accessory = /obj/item/clothing/accessory/badge/hadii_card
r_pocket = /obj/item/crowbar/red
/datum/outfit/admin/ert/pra_cosmonaut/get_id_access()
/obj/outfit/admin/ert/pra_cosmonaut/get_id_access()
return get_distress_access()
/datum/outfit/admin/ert/pra_cosmonaut/commissar
/obj/outfit/admin/ert/pra_cosmonaut/commissar
name = "Kosmostrelki Commissar"
uniform = /obj/item/clothing/under/tajaran/cosmonaut/commissar
@@ -50,7 +50,7 @@
l_pocket = /obj/item/device/megaphone
accessory = /obj/item/clothing/accessory/hadii_pin
/datum/outfit/admin/ert/pra_cosmonaut/commander
/obj/outfit/admin/ert/pra_cosmonaut/commander
name = "Kosmostrelki Commander"
back = /obj/item/storage/backpack/satchel/leather
@@ -72,7 +72,7 @@
l_pocket = /obj/item/device/megaphone
/datum/outfit/admin/ert/pra_cosmonaut/tesla
/obj/outfit/admin/ert/pra_cosmonaut/tesla
name = "Tesla Trooper"
r_hand = /obj/item/gun/energy/rifle/icelance
l_hand = /obj/item/rig/tesla
@@ -90,13 +90,13 @@
/obj/item/material/knife/trench = 1
)
/datum/outfit/admin/ert/pra_cosmonaut/tesla/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/ert/pra_cosmonaut/tesla/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
var/obj/item/organ/A = new /obj/item/organ/internal/augment/tesla/advanced(H)
var/obj/item/organ/external/affected = H.get_organ(A.parent_organ)
A.replaced(H, affected)
H.update_body()
/datum/outfit/admin/ert/pra_cosmonaut/medic
/obj/outfit/admin/ert/pra_cosmonaut/medic
name = "Kosmostrelki Combat Medic"
gloves = /obj/item/clothing/gloves/latex/nitrile/tajara
@@ -127,7 +127,7 @@
/obj/item/device/healthanalyzer = 1
)
/datum/outfit/admin/ert/pra_cosmonaut/engineer
/obj/outfit/admin/ert/pra_cosmonaut/engineer
name = "Kosmostrelki Sapper"
gloves = /obj/item/clothing/gloves/yellow/specialt
code/datums/outfits/ert/mercenary.dm
+5 -5
View File
@@ -1,4 +1,4 @@
/datum/outfit/admin/ert/mercenary
/obj/outfit/admin/ert/mercenary
name = "Mercenary Freelancer"
uniform = /obj/item/clothing/under/syndicate
@@ -34,10 +34,10 @@
id_iff = IFF_FREELANCER
/datum/outfit/admin/ert/mercenary/get_id_access()
/obj/outfit/admin/ert/mercenary/get_id_access()
return get_distress_access_lesser()
/datum/outfit/admin/ert/mercenary/specialist
/obj/outfit/admin/ert/mercenary/specialist
name = "Mercenary Freelancer Medic"
glasses = /obj/item/clothing/glasses/hud/health/aviator
@@ -67,7 +67,7 @@
/obj/item/material/knife/trench = 1
)
/datum/outfit/admin/ert/mercenary/engineer
/obj/outfit/admin/ert/mercenary/engineer
name = "Mercenary Freelancer Combat Engineer"
belt = /obj/item/storage/belt/military
@@ -97,7 +97,7 @@
/obj/item/device/flashlight/flare = 1,
)
/datum/outfit/admin/ert/mercenary/leader
/obj/outfit/admin/ert/mercenary/leader
name = "Mercenary Freelancer Leader"
l_hand = /obj/item/gun/projectile/automatic/rifle/shorty
r_hand = null
code/datums/outfits/ert/nt_ert.dm
+5 -5
View File
@@ -1,4 +1,4 @@
/datum/outfit/admin/ert/nanotrasen
/obj/outfit/admin/ert/nanotrasen
name = "NanoTrasen ERT Responder"
uniform = /obj/item/clothing/under/ert
@@ -20,10 +20,10 @@
/obj/item/ammo_magazine/a556/ap = 1
)
/datum/outfit/admin/ert/nanotrasen/get_id_access()
/obj/outfit/admin/ert/nanotrasen/get_id_access()
return get_all_station_access() | get_centcom_access("Emergency Response Team")
/datum/outfit/admin/ert/nanotrasen/specialist
/obj/outfit/admin/ert/nanotrasen/specialist
name = "NanoTrasen ERT Engineer Specialist"
belt = /obj/item/storage/belt/utility/full
@@ -31,7 +31,7 @@
belt_contents = null
/datum/outfit/admin/ert/nanotrasen/specialist/medical
/obj/outfit/admin/ert/nanotrasen/specialist/medical
name = "NanoTrasen ERT Medical Specialist"
belt = /obj/item/storage/belt/medical/first_responder/combat
@@ -48,7 +48,7 @@
/obj/item/reagent_containers/glass/bottle/perconol = 1
)
/datum/outfit/admin/ert/nanotrasen/leader
/obj/outfit/admin/ert/nanotrasen/leader
name = "NanoTrasen ERT Leader"
back = /obj/item/rig/ert
code/datums/outfits/ert/scc_ert.dm
+5 -5
View File
@@ -1,4 +1,4 @@
/datum/outfit/admin/ert/scc
/obj/outfit/admin/ert/scc
name = "ERT Security Specialist (SCC)"
uniform = /obj/item/clothing/under/rank/security
@@ -17,10 +17,10 @@
/obj/item/ammo_magazine/a556/ap = 1
)
/datum/outfit/admin/ert/scc/get_id_access()
/obj/outfit/admin/ert/scc/get_id_access()
return get_all_station_access() | get_centcom_access("Emergency Response Team")
/datum/outfit/admin/ert/scc/engineer
/obj/outfit/admin/ert/scc/engineer
name = "ERT Engineering Specialist (SCC)"
belt = /obj/item/storage/belt/utility/full
@@ -28,7 +28,7 @@
belt_contents = null
/datum/outfit/admin/ert/scc/medic
/obj/outfit/admin/ert/scc/medic
name = "ERT Medical Specialist (SCC)"
belt = /obj/item/storage/belt/medical/first_responder/combat
@@ -45,7 +45,7 @@
/obj/item/reagent_containers/glass/bottle/perconol = 1
)
/datum/outfit/admin/ert/scc/commander
/obj/outfit/admin/ert/scc/commander
name = "ERT Commander (SCC)"
back = /obj/item/rig/ert/scc
code/datums/outfits/ert/syndicate.dm
+2 -2
View File
@@ -1,4 +1,4 @@
/datum/outfit/admin/deathsquad/syndicate
/obj/outfit/admin/deathsquad/syndicate
name = "Syndicate Commando"
uniform = /obj/item/clothing/under/syndicate
@@ -24,7 +24,7 @@
id_iff = IFF_SYNDICATE
/datum/outfit/admin/deathsquad/syndicate/leader
/obj/outfit/admin/deathsquad/syndicate/leader
name = "Syndicate Commando Lead"
l_pocket = /obj/item/pinpointer
code/datums/outfits/ert/tcfl.dm
+9 -9
View File
@@ -1,4 +1,4 @@
/datum/outfit/admin/ert/legion
/obj/outfit/admin/ert/legion
name = "TCFL Volunteer"
head = /obj/item/clothing/head/beret/legion/field
@@ -14,7 +14,7 @@
id_iff = IFF_TCFL
/datum/outfit/admin/ert/legion/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/ert/legion/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(isvaurca(H))
H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/vaurca/filter(H), slot_wear_mask)
@@ -22,23 +22,23 @@
H.internal = preserve
H.internals.icon_state = "internal1"
/datum/outfit/admin/ert/legion/get_id_access()
/obj/outfit/admin/ert/legion/get_id_access()
return get_distress_access()
/datum/outfit/admin/ert/legion/specialist
/obj/outfit/admin/ert/legion/specialist
name = "TCFL Legionnaire"
accessory = /obj/item/clothing/accessory/legion/specialist
/datum/outfit/admin/ert/legion/leader
/obj/outfit/admin/ert/legion/leader
name = "TCFL Prefect"
accessory = /obj/item/clothing/accessory/legion
/datum/outfit/admin/ert/legion/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/ert/legion/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
.=..()
var/obj/item/card/id/distress/legion/I = H.wear_id
I.access += (ACCESS_CENT_SPECOPS)
/datum/outfit/admin/ert/legion/pilot
/obj/outfit/admin/ert/legion/pilot
name = "TCFL Dropship Pilot"
uniform = /obj/item/clothing/under/legion/pilot
head = /obj/item/clothing/head/helmet/pilot/legion
@@ -51,7 +51,7 @@
backpack_contents = null
/datum/outfit/admin/ert/legion/sentinel
/obj/outfit/admin/ert/legion/sentinel
name = "TCFL Sentinel"
head = /obj/item/clothing/head/beret/legion/sentinel
uniform = /obj/item/clothing/under/legion/sentinel
@@ -79,7 +79,7 @@
/obj/item/melee/telebaton = 1
)
/datum/outfit/admin/ert/legion/sentinel/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/ert/legion/sentinel/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
.=..()
var/obj/item/card/id/distress/legion/I = H.wear_id
I.access += (ACCESS_CENT_SPECOPS)
code/datums/outfits/event/outfit_events.dm
+9 -9
View File
@@ -1,4 +1,4 @@
/datum/outfit/admin/event/lance
/obj/outfit/admin/event/lance
name = "Lancer"
uniform = /obj/item/clothing/under/lance
@@ -38,13 +38,13 @@
id_iff = IFF_LANCER
var/id_access = "Lancer"
/datum/outfit/admin/event/lance/post_equip(mob/living/carbon/human/H, visualsOnly)
/obj/outfit/admin/event/lance/post_equip(mob/living/carbon/human/H, visualsOnly)
organize_voidsuit(H)
/datum/outfit/admin/event/lance/get_id_access()
/obj/outfit/admin/event/lance/get_id_access()
return get_syndicate_access(id_access)
/datum/outfit/admin/event/lance/engineer
/obj/outfit/admin/event/lance/engineer
name = "Lance Engineer"
back = /obj/item/gun/projectile/shotgun/pump/combat/sol
@@ -65,7 +65,7 @@
)
id_access = "Lance Engineer"
/datum/outfit/admin/event/lance/medic
/obj/outfit/admin/event/lance/medic
name = "Lance Medic"
gloves = /obj/item/clothing/gloves/latex/nitrile
@@ -91,7 +91,7 @@
)
id_access = "Lance Medic"
/datum/outfit/admin/event/lance/operative
/obj/outfit/admin/event/lance/operative
name = "Lance Operative"
uniform = /obj/item/clothing/under/dress/lance_dress/male
@@ -108,10 +108,10 @@
)
id_access = "Lance Operative"
/datum/outfit/admin/event/lance/operative/post_equip(mob/living/carbon/human/H, visualsOnly)
/obj/outfit/admin/event/lance/operative/post_equip(mob/living/carbon/human/H, visualsOnly)
return
/datum/outfit/admin/event/sol_marine
/obj/outfit/admin/event/sol_marine
name = "Solarian Marine"
uniform = /obj/item/clothing/under/rank/sol
@@ -144,7 +144,7 @@
id_iff = IFF_SOL
/datum/outfit/admin/event/sol_marine/heavy
/obj/outfit/admin/event/sol_marine/heavy
name = "Heavy Solarian Marine"
head = null
code/datums/outfits/event/outfit_killers.dm
+5 -5
View File
@@ -1,4 +1,4 @@
/datum/outfit/admin/killer
/obj/outfit/admin/killer
name = "Masked Killer"
uniform = /obj/item/clothing/under/overalls
@@ -14,13 +14,13 @@
r_hand = /obj/item/material/twohanded/fireaxe
id = null
/datum/outfit/admin/killer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/killer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
for(var/obj/item/carried_item in H.contents)
if(!istype(carried_item, /obj/item/implant))//If it's not an implant.
carried_item.add_blood(H)//Oh yes, there will be blood...
/datum/outfit/admin/killer/assassin
/obj/outfit/admin/killer/assassin
name = "Assassin"
uniform = /obj/item/clothing/under/suit_jacket
@@ -35,7 +35,7 @@
pda = /obj/item/modular_computer/handheld/pda/command
id_iff = IFF_SYNDICATE
/datum/outfit/admin/killer/assassin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/killer/assassin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
var/obj/item/storage/secure/briefcase/sec_briefcase = new(H)
for(var/obj/item/briefcase_item in sec_briefcase)
qdel(briefcase_item)
@@ -47,5 +47,5 @@
sec_briefcase.contents += new /obj/item/plastique
H.equip_to_slot_or_del(sec_briefcase, slot_l_hand)
/datum/outfit/admin/killer/assassin/get_id_access()
/obj/outfit/admin/killer/assassin/get_id_access()
return get_all_station_access()
code/datums/outfits/event/outfit_megacorps.dm
+7 -7
View File
@@ -1,4 +1,4 @@
/datum/outfit/admin/megacorp/hephaestus_trooper
/obj/outfit/admin/megacorp/hephaestus_trooper
name = "Hephaestus Asset Protection"
uniform = /obj/item/clothing/under/rank/engineer/apprentice/heph
@@ -28,7 +28,7 @@
)
id_iff = IFF_HEPH
/datum/outfit/admin/megacorp/hephaestus_trooper/heavy
/obj/outfit/admin/megacorp/hephaestus_trooper/heavy
name = "Hephaestus Heavy Asset Protection"
back = /obj/item/gun/projectile/shotgun/pump/combat
@@ -41,7 +41,7 @@
/obj/item/ammo_casing/shotgun/pellet = 8
)
/datum/outfit/admin/megacorp/zenghu_trooper
/obj/outfit/admin/megacorp/zenghu_trooper
name = "Zeng Hu Pharmaceuticals Asset Protection"
uniform = /obj/item/clothing/under/rank/medical/first_responder/zeng
@@ -71,7 +71,7 @@
)
id_iff = IFF_ZENGHU
/datum/outfit/admin/megacorp/zenghu_trooper/heavy
/obj/outfit/admin/megacorp/zenghu_trooper/heavy
name = "Zeng Hu Pharmaceuticals Heavy Asset Protection"
gloves = /obj/item/clothing/gloves/force
@@ -79,7 +79,7 @@
accessory_contents = list(/obj/item/gun/energy/decloner = 1)
/datum/outfit/admin/megacorp/zavodskoi_trooper
/obj/outfit/admin/megacorp/zavodskoi_trooper
name = "Zavodskoi Interstellar Asset Protection"
uniform = /obj/item/clothing/under/rank/security/zavod
@@ -115,7 +115,7 @@
)
id_iff = IFF_ZAVOD
/datum/outfit/admin/megacorp/zavodskoi_trooper/heavy
/obj/outfit/admin/megacorp/zavodskoi_trooper/heavy
name = "Zavodskoi Interstellar Heavy Asset Protection"
gloves = /obj/item/clothing/gloves/force
@@ -130,7 +130,7 @@
/obj/item/ammo_magazine/c762/sol = 2
)
/datum/outfit/admin/megacorp/einstein_trooper/heavy
/obj/outfit/admin/megacorp/einstein_trooper/heavy
name = "Einstein Engines Asset Protection"
uniform = /obj/item/clothing/under/rank/einstein
code/datums/outfits/event/outfit_nanotrasen.dm
+20 -20
View File
@@ -1,4 +1,4 @@
/datum/outfit/admin/nt
/obj/outfit/admin/nt
name = "NanoTrasen Representative"
uniform = /obj/item/clothing/under/rank/centcom
@@ -16,10 +16,10 @@
id_icon = "centcom"
var/id_access = "NanoTrasen Representative"
/datum/outfit/admin/nt/get_id_access()
/obj/outfit/admin/nt/get_id_access()
return get_all_station_access() | get_centcom_access(id_access)
/datum/outfit/admin/nt/officer
/obj/outfit/admin/nt/officer
name = "NanoTrasen Navy Officer"
uniform = /obj/item/clothing/under/rank/centcom_officer
@@ -27,7 +27,7 @@
head = /obj/item/clothing/head/beret/centcom/officer
l_pocket = /obj/item/device/orbital_dropper/icarus_drones
/datum/outfit/admin/nt/captain
/obj/outfit/admin/nt/captain
name = "NanoTrasen Navy Captain"
uniform = /obj/item/clothing/under/rank/centcom_captain
@@ -35,7 +35,7 @@
head = /obj/item/clothing/head/beret/centcom/captain
l_pocket = /obj/item/device/orbital_dropper/icarus_drones
/datum/outfit/admin/nt/protection_detail
/obj/outfit/admin/nt/protection_detail
name = "ERT Protection Detail"
uniform = /obj/item/clothing/under/ccpolice
@@ -62,7 +62,7 @@
id_icon = "ccia"
id_access = "CCIA Agent"
/datum/outfit/admin/nt/protection_detail/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/nt/protection_detail/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H && H.belt)
@@ -83,7 +83,7 @@
H.belt.contents += shield
/datum/outfit/admin/nt/ert_commander
/obj/outfit/admin/nt/ert_commander
name = "ERT Commander"
uniform = /obj/item/clothing/under/rank/centcom_commander
@@ -106,7 +106,7 @@
id_access = "BlackOps Commander"
/datum/outfit/admin/nt/cciaa
/obj/outfit/admin/nt/cciaa
name = "CCIA Agent"
uniform = /obj/item/clothing/under/rank/centcom_officer
@@ -128,7 +128,7 @@
id_icon = "ccia"
id_access = "CCIA Agent"
/datum/outfit/admin/nt/odinsec
/obj/outfit/admin/nt/odinsec
name = "NTCC Odin Security Specialist"
uniform = /obj/item/clothing/under/ccpolice
@@ -161,7 +161,7 @@
id_access = "Odin Security"
/datum/outfit/admin/nt/odinsec/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/nt/odinsec/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H && H.w_uniform)
@@ -172,7 +172,7 @@
var/obj/item/clothing/under/rank/U = H.w_uniform
U.attach_accessory(null, holster)
/datum/outfit/admin/nt/specops
/obj/outfit/admin/nt/specops
name = "Special Operations Officer"
uniform = /obj/item/clothing/under/syndicate/combat
@@ -192,7 +192,7 @@
id_access = "Death Commando"
/datum/outfit/admin/nt/bssb
/obj/outfit/admin/nt/bssb
name = "BSSB Agent"
uniform = /obj/item/clothing/under/rank/bssb
@@ -216,14 +216,14 @@
id_icon = "bssb"
id_access = "CCIA Agent"
/datum/outfit/admin/nt/bssb/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/nt/bssb/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H?.wear_suit)
var/obj/item/clothing/accessory/badge/bssb/senior/badge = new(src)
var/obj/item/clothing/U = H.wear_suit
U.attach_accessory(null, badge)
/datum/outfit/admin/nt/bssb/guard
/obj/outfit/admin/nt/bssb/guard
name = "BSSB Escort"
suit = /obj/item/clothing/suit/storage/toggle/bssb/armor
@@ -251,14 +251,14 @@
/obj/item/clothing/head/helmet = 1
)
/datum/outfit/admin/nt/bssb/guard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/nt/bssb/guard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H?.wear_suit)
var/obj/item/clothing/accessory/badge/bssb/badge = new(src)
var/obj/item/clothing/U = H.wear_suit
U.attach_accessory(null, badge)
/datum/outfit/admin/nt/odindoc
/obj/outfit/admin/nt/odindoc
name = "NTCC Odin Medical Specialist"
uniform = /obj/item/clothing/under/rank/medical/surgeon/zavod
@@ -297,7 +297,7 @@
id_access = "Medical Doctor"
/datum/outfit/admin/nt/odinpharm
/obj/outfit/admin/nt/odinpharm
name = "NTCC Odin Pharmacy Specialist"
uniform = /obj/item/clothing/under/rank/medical/pharmacist
@@ -314,7 +314,7 @@
id_access = "Medical Doctor"
/datum/outfit/admin/nt/odinbartender
/obj/outfit/admin/nt/odinbartender
name = "NTCC Odin Bartender"
uniform = /obj/item/clothing/under/rank/bartender
@@ -324,7 +324,7 @@
id_access = "Service"
/datum/outfit/admin/nt/odinchef
/obj/outfit/admin/nt/odinchef
name = "NTCC Odin Chef"
uniform = /obj/item/clothing/under/rank/chef
@@ -336,7 +336,7 @@
id_access = "Service"
/datum/outfit/admin/nt/odinjanitor
/obj/outfit/admin/nt/odinjanitor
name = "NTCC Odin Sanitation Specialist"
uniform = /obj/item/clothing/under/rank/janitor
code/datums/outfits/event/outfit_scc.dm
+4 -4
View File
@@ -1,4 +1,4 @@
/datum/outfit/admin/scc
/obj/outfit/admin/scc
name = "SCC Agent"
uniform = /obj/item/clothing/under/rank/scc
@@ -20,17 +20,17 @@
id_icon = "centcom"
var/id_access = "SCC Agent"
/datum/outfit/admin/scc/get_id_access()
/obj/outfit/admin/scc/get_id_access()
return get_all_station_access() | get_centcom_access(id_access)
/datum/outfit/admin/scc/executive
/obj/outfit/admin/scc/executive
name = "SCC Executive"
uniform = /obj/item/clothing/under/rank/scc/executive
id_access = "SCC Executive"
/datum/outfit/admin/scc/bodyguard
/obj/outfit/admin/scc/bodyguard
name = "SCC Bodyguard"
head = /obj/item/clothing/head/helmet/merc/scc
code/datums/outfits/event/outfit_tfcl.dm
+2 -2
View File
@@ -1,4 +1,4 @@
/datum/outfit/admin/tcfl
/obj/outfit/admin/tcfl
name = "TCFL Legate"
uniform = /obj/item/clothing/under/legion/legate
@@ -27,5 +27,5 @@
id_iff = IFF_TCFL
var/id_access = "NanoTrasen Representative"
/datum/outfit/admin/tcfl/get_id_access()
/obj/outfit/admin/tcfl/get_id_access()
return get_all_accesses() | get_centcom_access(id_access)
code/datums/outfits/outfit.dm
+97 -16
View File
@@ -1,5 +1,19 @@
/datum/outfit
var/name = "Naked"
/// General outfit abstraction.
/// To be used for both a mob's outfit (for a ghostspawner, ship/station job, corpse),
/// where the outfit is applied to the mob.
/// But also for "standalone" outfits (just items spawned in a locker, on the floor),
/// where the outfit items are "spilled" onto the floor (not all items, does not spawn IDs for example).
/obj/outfit
name = "Naked"
icon = 'icons/effects/map_effects.dmi'
icon_state = "outfit"
/// If spilling onto the floor, prob chance for the item to spill.
var/spill_prob = 98
/// If spilling onto the floor, if true, items to spill will be shuffled.
var/spill_shuffle = TRUE
var/collect_not_del = FALSE
//The following vars can either be a path or a list of paths
@@ -11,11 +25,13 @@
var/gloves = null
var/wrist = null
var/shoes = null
var/head = null
var/mask = null
var/l_ear = null
var/r_ear = null
var/glasses = null
var/l_pocket = null
var/r_pocket = null
var/suit_store = null
@@ -74,7 +90,72 @@
var/list/implants = null //A list of implants that should be implanted
var/list/spells = list() // A list of spells to grant
/datum/outfit/proc/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/Initialize(mapload, ...)
. = ..()
// if loc is not null, means the outfit was mapped in or spawned manually
if(loc!=null)
spill()
/// Spawn the items on the loc turf.
/// Delete self later.
/obj/outfit/proc/spill()
// get a list of item types to spawn
var/list/items = list(
uniform,
suit,
back,
belt,
gloves,
wrist,
shoes,
head,
mask,
l_ear,
r_ear,
glasses,
l_pocket,
r_pocket,
suit_store,
accessory,
suit_accessory,
l_hand,
r_hand,
pda,
radio,
backpack,
)
// add contents to the list
for(var/c in backpack_contents)
items += c
for(var/c in accessory_contents)
items += c
for(var/c in belt_contents)
items += c
// shuffle
if(spill_shuffle)
items = shuffle(items)
// go over each item
for(var/i in items)
if(i && prob(spill_prob))
spill_item(i)
// and finally delete self
qdel(src)
/obj/outfit/proc/spill_item(var/path)
if(islist(path))
path = pick(path)
if(path && ispath(path))
new path(loc)
/obj/outfit/proc/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
//to be overriden for customization depending on client prefs,species etc
if(allow_backbag_choice)
switch(H.backbag)
@@ -211,14 +292,14 @@
else if (wrist)
equip_item(H, wrist, slot_wrists, callback = radio_callback)
/datum/outfit/proc/turn_into_thinset(var/obj/item/device/radio/headset/wrist/radio)
/obj/outfit/proc/turn_into_thinset(var/obj/item/device/radio/headset/wrist/radio)
if(istype(radio))
radio.icon_state = replacetext(radio.icon_state, "wrist", "thin")
radio.item_state = replacetext(radio.item_state, "wrist", "thin")
// Used to equip an item to the mob. Mainly to prevent copypasta for collect_not_del.
//override_collect temporarily allows equip_or_collect without enabling it for the job. Mostly used to prevent weirdness with hand equips when the player is missing one
/datum/outfit/proc/equip_item(mob/living/carbon/human/H, path, slot, var/override_collect = FALSE, var/item_color, var/datum/callback/callback)
/obj/outfit/proc/equip_item(mob/living/carbon/human/H, path, slot, var/override_collect = FALSE, var/item_color, var/datum/callback/callback)
var/obj/item/I
if(isnum(path)) //Check if parameter is not numeric. Must be a path, list of paths or name of a gear datum
@@ -241,7 +322,7 @@
else
H.equip_to_slot_or_del(I, slot)
/datum/outfit/proc/equip_uniform_accessory(mob/living/carbon/human/H)
/obj/outfit/proc/equip_uniform_accessory(mob/living/carbon/human/H)
if(!H)
return
@@ -266,7 +347,7 @@
if(W)
holster.holster(W, H)
/datum/outfit/proc/equip_suit_accessory(mob/living/carbon/human/H)
/obj/outfit/proc/equip_suit_accessory(mob/living/carbon/human/H)
if(!H)
return
@@ -275,10 +356,10 @@
var/obj/item/clothing/accessory/A = new suit_accessory
S.attach_accessory(H, A)
/datum/outfit/proc/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/proc/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
//to be overriden for changing items post equip (such as toggeling internals, ...)
/datum/outfit/proc/equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/proc/equip(mob/living/carbon/human/H, visualsOnly = FALSE)
//Start with uniform,suit,backpack for additional slots
if(back)
equip_item(H, back, slot_back)
@@ -459,7 +540,7 @@
return 1
// this proc takes all the scattered voidsuit pieces and reassembles them into one piece
/datum/outfit/proc/organize_voidsuit(mob/living/carbon/human/H, var/add_magboots = TRUE)
/obj/outfit/proc/organize_voidsuit(mob/living/carbon/human/H, var/add_magboots = TRUE)
var/obj/item/tank/T = H.s_store
H.unEquip(T, TRUE)
@@ -479,7 +560,7 @@
H.equip_to_slot_if_possible(VS, slot_wear_suit)
/datum/outfit/proc/apply_fingerprints(mob/living/carbon/human/H)
/obj/outfit/proc/apply_fingerprints(mob/living/carbon/human/H)
if(!istype(H))
return
if(H.back)
@@ -520,7 +601,7 @@
H.r_store.add_fingerprint(H, 1)
return 1
/datum/outfit/proc/imprint_idcard(mob/living/carbon/human/H, obj/item/card/id/C)
/obj/outfit/proc/imprint_idcard(mob/living/carbon/human/H, obj/item/card/id/C)
if(istype(C))
C.access = get_id_access(H)
C.rank = get_id_rank(H)
@@ -530,7 +611,7 @@
if(H.mind && H.mind.initial_account)
C.associated_account_number = H.mind.initial_account.account_number
/datum/outfit/proc/register_pda(obj/item/modular_computer/P, obj/item/card/id/I)
/obj/outfit/proc/register_pda(obj/item/modular_computer/P, obj/item/card/id/I)
if(!P.card_slot)
return
P.card_slot.insert_id(I)
@@ -539,15 +620,15 @@
P.enable_computer(null, TRUE) // passing null because we don't want the UI to open
P.minimize_program()
/datum/outfit/proc/get_id_access(mob/living/carbon/human/H)
/obj/outfit/proc/get_id_access(mob/living/carbon/human/H)
return list()
/datum/outfit/proc/get_id_assignment(mob/living/carbon/human/H, var/ignore_suffix = FALSE)
/obj/outfit/proc/get_id_assignment(mob/living/carbon/human/H, var/ignore_suffix = FALSE)
. = GetAssignment(H)
if (. && . != "Unassigned" && H?.mind?.selected_faction && !ignore_suffix)
if (H.mind.selected_faction.title_suffix)
. += " ([H.mind.selected_faction.title_suffix])"
/datum/outfit/proc/get_id_rank(mob/living/carbon/human/H)
/obj/outfit/proc/get_id_rank(mob/living/carbon/human/H)
return GetAssignment(H)
code/datums/outfits/outfit_admin.dm
+11 -11
View File
@@ -1,22 +1,22 @@
/datum/outfit/admin
/obj/outfit/admin
var/id_icon
/datum/outfit/admin/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(!visualsOnly)
if(H.mind)
H.mind.assigned_role = name
H.job = name
/datum/outfit/admin/imprint_idcard(mob/living/carbon/human/H, obj/item/card/id/C)
/obj/outfit/admin/imprint_idcard(mob/living/carbon/human/H, obj/item/card/id/C)
..()
if(id_icon)
C.icon_state = id_icon
/datum/outfit/admin/random_employee
/obj/outfit/admin/random_employee
name = "Random Employee"
/datum/outfit/admin/random_employee/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/random_employee/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(!visualsOnly)
//Select a random job, set the assigned_role / job var and equip it
@@ -32,7 +32,7 @@
job.equip(H, FALSE, FALSE, alt_title)
/datum/outfit/admin/random
/obj/outfit/admin/random
name = "Random Civilian"
uniform = "suit selection"
@@ -49,7 +49,7 @@
/obj/item/storage/backpack/duffel
)
/datum/outfit/admin/random/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/random/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(!visualsOnly)
if(prob(10)) //Equip something smokable
@@ -80,19 +80,19 @@
var/datum/gear/G = gear_datums["gloves selection"]
H.equip_or_collect(G.spawn_random(), slot_gloves)
/datum/outfit/admin/random/visitor
/obj/outfit/admin/random/visitor
name = "Random Visitor"
id = /obj/item/card/id
pda = /obj/item/modular_computer/handheld/pda/civilian
/datum/outfit/admin/random/visitor/get_id_assignment()
/obj/outfit/admin/random/visitor/get_id_assignment()
return "Visitor"
/datum/outfit/admin/random/visitor/get_id_rank()
/obj/outfit/admin/random/visitor/get_id_rank()
return "Visitor"
/datum/outfit/admin/virtual_reality
/obj/outfit/admin/virtual_reality
name = "Virtual Reality Outfit"
uniform = /obj/item/clothing/under/chameleon
suit = /obj/item/clothing/suit/chameleon
code/datums/outfits/outfit_antag.dm
+32 -32
View File
@@ -1,6 +1,6 @@
// Anything that's coded as an "antagonist" that needs outfits should go here, unless it's an ERT.
/datum/outfit/admin/syndicate
/obj/outfit/admin/syndicate
name = "Syndicate Agent"
allow_backbag_choice = TRUE
@@ -30,7 +30,7 @@
var/id_access = "Syndicate Operative"
var/uplink_uses = DEFAULT_TELECRYSTAL_AMOUNT
/datum/outfit/admin/syndicate/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/syndicate/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
@@ -42,11 +42,11 @@
U.hidden_uplink.bluecrystals = round(uplink_uses / 2)
U.hidden_uplink.tgui_menu = 1
/datum/outfit/admin/syndicate/get_id_access()
/obj/outfit/admin/syndicate/get_id_access()
return get_syndicate_access(id_access)
/datum/outfit/admin/syndicate/operative
/obj/outfit/admin/syndicate/operative
name = "Syndicate Operative"
suit = /obj/item/clothing/suit/space/void/merc
@@ -71,7 +71,7 @@
/obj/item/clothing/shoes/combat = 1
)
/datum/outfit/admin/syndicate/officer
/obj/outfit/admin/syndicate/officer
name = "Syndicate Officer"
head = /obj/item/clothing/head/beret/red
@@ -95,7 +95,7 @@
)
id_access = "Syndicate Operative Leader"
/datum/outfit/admin/syndicate/spy
/obj/outfit/admin/syndicate/spy
name = "Syndicate Spy"
uniform = /obj/item/clothing/under/suit_jacket/really_black
shoes = /obj/item/clothing/shoes/sneakers/black/noslip
@@ -108,7 +108,7 @@
// Syndicate Auxiliary Outfits (ninja, merc, etc.)
/datum/outfit/admin/syndicate/ninja
/obj/outfit/admin/syndicate/ninja
name = "Infiltrator"
allow_backbag_choice = FALSE
@@ -137,14 +137,14 @@
id_access = "Syndicate Agent"
/datum/outfit/admin/syndicate/ninja/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/syndicate/ninja/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
H.equip_to_slot_or_del(new /obj/item/device/special_uplink/ninja(H, H.mind), slot_l_store)
/datum/outfit/admin/syndicate/mercenary
/obj/outfit/admin/syndicate/mercenary
name = "Mercenary"
uniform = /obj/item/clothing/under/syndicate
@@ -161,7 +161,7 @@
id_iff = IFF_MERCENARY
/datum/outfit/admin/syndicate/mercenary/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/syndicate/mercenary/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
@@ -169,7 +169,7 @@
if(!H.shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots/toeless(H), slot_shoes)
/datum/outfit/admin/syndicate/mercenary/loner
/obj/outfit/admin/syndicate/mercenary/loner
name = "Loner"
l_ear = /obj/item/device/radio/headset/syndicate
@@ -184,7 +184,7 @@
id_iff = IFF_LONER
id_access = "Lone Operative"
/datum/outfit/admin/syndicate/raider
/obj/outfit/admin/syndicate/raider
name = "Raider"
allow_backbag_choice = FALSE
@@ -335,7 +335,7 @@
backpack_contents = list()
/datum/outfit/admin/syndicate/raider/equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/syndicate/raider/equip(mob/living/carbon/human/H, visualsOnly = FALSE)
new /obj/random/backpack(H.loc)
var/obj/item/storage/backpack/bag
@@ -370,7 +370,7 @@
return ..()
/datum/outfit/admin/syndicate/raider/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/syndicate/raider/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
@@ -385,7 +385,7 @@
if(W)
W.handle_item_insertion(passport)
/datum/outfit/admin/syndicate/burglar
/obj/outfit/admin/syndicate/burglar
name = "Burglar"
allow_backbag_choice = FALSE
@@ -431,7 +431,7 @@
id_iff = IFF_BURGLAR
/datum/outfit/admin/syndicate/burglar/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/syndicate/burglar/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
@@ -488,7 +488,7 @@
W.handle_item_insertion(passport)
/datum/outfit/admin/syndicate/jockey
/obj/outfit/admin/syndicate/jockey
name = "Jockey"
allow_backbag_choice = FALSE
@@ -525,7 +525,7 @@
id_iff = IFF_JOCKEY
/datum/outfit/admin/syndicate/jockey/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/syndicate/jockey/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
@@ -549,7 +549,7 @@
// Non-syndicate antag outfits
/datum/outfit/admin/highlander
/obj/outfit/admin/highlander
name = "Highlander"
uniform = /obj/item/clothing/under/kilt
@@ -562,7 +562,7 @@
id = /obj/item/card/id/highlander
id_iff = IFF_HIGHLANDER
/datum/outfit/admin/highlander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/highlander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
@@ -572,7 +572,7 @@
W.name = "[H.real_name]'s ID"
W.registered_name = H.real_name
/datum/outfit/admin/syndicate/cultist
/obj/outfit/admin/syndicate/cultist
name = "Cultist"
allow_backbag_choice = FALSE
@@ -592,10 +592,10 @@
id_iff = IFF_CULTIST
/datum/outfit/admin/syndicate/cultist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/syndicate/cultist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
return
/datum/outfit/admin/syndicate/cultist/super
/obj/outfit/admin/syndicate/cultist/super
name = "Super Cultist"
head = /obj/item/clothing/head/helmet/space/cult
@@ -603,7 +603,7 @@
suit_store = /obj/item/gun/energy/rifle/cult
/datum/outfit/admin/syndicate/raider_techno
/obj/outfit/admin/syndicate/raider_techno
name = "Raider Techno"
allow_backbag_choice = FALSE
@@ -624,7 +624,7 @@
id_iff = IFF_BLUESPACE
/datum/outfit/admin/syndicate/raider_techno/equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/syndicate/raider_techno/equip(mob/living/carbon/human/H, visualsOnly = FALSE)
var/list/loadouts = list("Nature", "Techno", "Cobra", "Brawler", "Shimmer")
if(H.gender in list(FEMALE, PLURAL, NEUTER))
loadouts += list("Storm", "Sorceress")
@@ -666,7 +666,7 @@
back = /obj/item/technomancer_core/summoner
return ..()
/datum/outfit/admin/syndicate/raider_techno/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/syndicate/raider_techno/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
@@ -689,14 +689,14 @@
if(catalog)
catalog.bind_to_owner(H)
/datum/outfit/admin/golem
/obj/outfit/admin/golem
name = "Bluespace Golem"
allow_backbag_choice = FALSE
l_ear = /obj/item/device/radio/headset/bluespace
id_iff = IFF_BLUESPACE
/datum/outfit/admin/techomancer
/obj/outfit/admin/techomancer
name = "Technomancer"
allow_backbag_choice = FALSE
@@ -716,7 +716,7 @@
var/id_assignment = "Technomagus"
/datum/outfit/admin/techomancer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/techomancer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
@@ -734,7 +734,7 @@
if(catalog)
catalog.bind_to_owner(H)
/datum/outfit/admin/techomancer/apprentice
/obj/outfit/admin/techomancer/apprentice
name = "Technomancer Apprentice"
head = /obj/item/clothing/head/chameleon/technomancer
@@ -746,7 +746,7 @@
id_assignment = "Techno-apprentice"
/datum/outfit/admin/techomancer/apprentice/post_equip(mob/living/carbon/human/H, visualsOnly)
/obj/outfit/admin/techomancer/apprentice/post_equip(mob/living/carbon/human/H, visualsOnly)
. = ..()
if(visualsOnly)
return
@@ -756,7 +756,7 @@
of your own. You also have a catalog, to purchase your own functions and equipment as you see fit.</b>")
to_chat(H, "<b>It would be wise to speak to your master, and learn what their plans are for today. Your clothing is holographic, you should change its look before leaving.</b>")
/datum/outfit/admin/techomancer/golem
/obj/outfit/admin/techomancer/golem
name = "Technomancer Golem"
head = null
code/game/antagonist/outsider/burglar.dm
+2 -2
View File
@@ -46,8 +46,8 @@ var/datum/antagonist/burglar/burglars
if(I.loc != player)
qdel(I)
player.preEquipOutfit(/datum/outfit/admin/syndicate/burglar, FALSE)
player.equipOutfit(/datum/outfit/admin/syndicate/burglar, FALSE)
player.preEquipOutfit(/obj/outfit/admin/syndicate/burglar, FALSE)
player.equipOutfit(/obj/outfit/admin/syndicate/burglar, FALSE)
player.force_update_limbs()
player.update_eyes()
player.regenerate_icons()
code/game/antagonist/outsider/jockey.dm
+2 -2
View File
@@ -45,8 +45,8 @@ var/datum/antagonist/jockey/jockeys
if(I.loc != player)
qdel(I)
player.preEquipOutfit(/datum/outfit/admin/syndicate/jockey, FALSE)
player.equipOutfit(/datum/outfit/admin/syndicate/jockey, FALSE)
player.preEquipOutfit(/obj/outfit/admin/syndicate/jockey, FALSE)
player.equipOutfit(/obj/outfit/admin/syndicate/jockey, FALSE)
player.force_update_limbs()
player.update_eyes()
player.regenerate_icons()
code/game/antagonist/outsider/loner.dm
+2 -2
View File
@@ -37,8 +37,8 @@ var/datum/antagonist/loner/loners
if(I.loc != player)
qdel(I)
player.preEquipOutfit(/datum/outfit/admin/syndicate/mercenary/loner, FALSE)
player.equipOutfit(/datum/outfit/admin/syndicate/mercenary/loner, FALSE)
player.preEquipOutfit(/obj/outfit/admin/syndicate/mercenary/loner, FALSE)
player.equipOutfit(/obj/outfit/admin/syndicate/mercenary/loner, FALSE)
player.set_psi_rank(PSI_RANK_HARMONIOUS)
var/singleton/psionic_power/P = GET_SINGLETON(/singleton/psionic_power/zona_absorption)
P.apply(player)
code/game/antagonist/outsider/mercenary.dm
+2 -2
View File
@@ -46,8 +46,8 @@ var/datum/antagonist/mercenary/mercs
if(I.loc != player)
qdel(I)
player.preEquipOutfit(/datum/outfit/admin/syndicate/mercenary, FALSE)
player.equipOutfit(/datum/outfit/admin/syndicate/mercenary, FALSE)
player.preEquipOutfit(/obj/outfit/admin/syndicate/mercenary, FALSE)
player.equipOutfit(/obj/outfit/admin/syndicate/mercenary, FALSE)
player.force_update_limbs()
player.update_eyes()
player.regenerate_icons()
code/game/antagonist/outsider/ninja.dm
+2 -2
View File
@@ -111,8 +111,8 @@ var/datum/antagonist/ninja/ninjas
player.drop_from_inventory(I)
if(I.loc != player)
qdel(I)
player.preEquipOutfit(/datum/outfit/admin/syndicate/ninja, FALSE)
player.equipOutfit(/datum/outfit/admin/syndicate/ninja, FALSE)
player.preEquipOutfit(/obj/outfit/admin/syndicate/ninja, FALSE)
player.equipOutfit(/obj/outfit/admin/syndicate/ninja, FALSE)
player.force_update_limbs()
player.update_eyes()
player.regenerate_icons()
code/game/antagonist/outsider/raider.dm
+2 -2
View File
@@ -130,8 +130,8 @@ var/datum/antagonist/raider/raiders
if(I.loc != player)
qdel(I)
player.preEquipOutfit(/datum/outfit/admin/syndicate/raider, FALSE)
player.equipOutfit(/datum/outfit/admin/syndicate/raider, FALSE)
player.preEquipOutfit(/obj/outfit/admin/syndicate/raider, FALSE)
player.equipOutfit(/obj/outfit/admin/syndicate/raider, FALSE)
player.force_update_limbs()
player.update_eyes()
player.regenerate_icons()
code/game/antagonist/outsider/raider_techno.dm
+2 -2
View File
@@ -54,8 +54,8 @@ var/datum/antagonist/raider_techno/raider_techno
if(I.loc != player)
qdel(I)
player.preEquipOutfit(/datum/outfit/admin/syndicate/raider_techno, FALSE)
player.equipOutfit(/datum/outfit/admin/syndicate/raider_techno, FALSE)
player.preEquipOutfit(/obj/outfit/admin/syndicate/raider_techno, FALSE)
player.equipOutfit(/obj/outfit/admin/syndicate/raider_techno, FALSE)
player.force_update_limbs()
player.update_eyes()
player.regenerate_icons()
code/game/antagonist/outsider/technomancer.dm
+4 -4
View File
@@ -37,14 +37,14 @@ var/datum/antagonist/technomancer/technomancers
if(!..())
return FALSE
technomancer_mob.preEquipOutfit(/datum/outfit/admin/techomancer, FALSE)
technomancer_mob.equipOutfit(/datum/outfit/admin/techomancer, FALSE)
technomancer_mob.preEquipOutfit(/obj/outfit/admin/techomancer, FALSE)
technomancer_mob.equipOutfit(/obj/outfit/admin/techomancer, FALSE)
return TRUE
/datum/antagonist/technomancer/proc/equip_apprentice(var/mob/living/carbon/human/technomancer_mob)
technomancer_mob.preEquipOutfit(/datum/outfit/admin/techomancer/apprentice, FALSE)
technomancer_mob.equipOutfit(/datum/outfit/admin/techomancer/apprentice, FALSE)
technomancer_mob.preEquipOutfit(/obj/outfit/admin/techomancer/apprentice, FALSE)
technomancer_mob.equipOutfit(/obj/outfit/admin/techomancer/apprentice, FALSE)
return TRUE
/datum/antagonist/technomancer/check_victory()
code/game/antagonist/station/highlander.dm
+2 -2
View File
@@ -41,8 +41,8 @@ var/datum/antagonist/highlander/highlanders
if(I.loc != player)
qdel(I)
player.preEquipOutfit(/datum/outfit/admin/highlander, FALSE)
player.equipOutfit(/datum/outfit/admin/highlander, FALSE)
player.preEquipOutfit(/obj/outfit/admin/highlander, FALSE)
player.equipOutfit(/obj/outfit/admin/highlander, FALSE)
player.force_update_limbs()
player.update_eyes()
player.regenerate_icons()
code/game/gamemodes/antagspawner.dm
+2 -2
View File
@@ -57,7 +57,7 @@
icon_state = "locator"
mob_type = /mob/living/carbon/human
ghost_role_id = "technoapprentice"
var/outfit_type = /datum/outfit/admin/techomancer/apprentice
var/outfit_type = /obj/outfit/admin/techomancer/apprentice
var/preserve_appearance = FALSE
/obj/item/antag_spawner/technomancer_apprentice/attack_self(var/mob/user)
@@ -97,5 +97,5 @@
desc = "A teleportation device, which will bring a powerful synthetic helper to you."
mob_type = /mob/living/carbon/human/technomancer_golem
ghost_role_id = "technogolem"
outfit_type = /datum/outfit/admin/techomancer/golem
outfit_type = /obj/outfit/admin/techomancer/golem
preserve_appearance = TRUE
code/game/jobs/faction/hephaestus.dm
+22 -22
View File
@@ -38,21 +38,21 @@
)
titles_to_loadout = list(
"Hangar Technician" = /datum/outfit/job/hangar_tech/hephaestus,
"Shaft Miner" = /datum/outfit/job/mining/hephaestus,
"Machinist" = /datum/outfit/job/machinist/hephaestus,
"Engineer" = /datum/outfit/job/engineer/hephaestus,
"Atmospheric Technician" = /datum/outfit/job/atmos/hephaestus,
"Engineering Apprentice" = /datum/outfit/job/intern_eng/hephaestus,
"Atmospherics Apprentice" = /datum/outfit/job/intern_atmos/hephaestus,
"Corporate Reporter" = /datum/outfit/job/journalist/hephaestus,
"Corporate Liaison" = /datum/outfit/job/representative/hephaestus,
"Off-Duty Crew Member" = /datum/outfit/job/visitor/hephaestus,
"Engineering Personnel" = /datum/outfit/job/engineer/hephaestus,
"Operations Personnel" = /datum/outfit/job/hangar_tech/hephaestus
"Hangar Technician" = /obj/outfit/job/hangar_tech/hephaestus,
"Shaft Miner" = /obj/outfit/job/mining/hephaestus,
"Machinist" = /obj/outfit/job/machinist/hephaestus,
"Engineer" = /obj/outfit/job/engineer/hephaestus,
"Atmospheric Technician" = /obj/outfit/job/atmos/hephaestus,
"Engineering Apprentice" = /obj/outfit/job/intern_eng/hephaestus,
"Atmospherics Apprentice" = /obj/outfit/job/intern_atmos/hephaestus,
"Corporate Reporter" = /obj/outfit/job/journalist/hephaestus,
"Corporate Liaison" = /obj/outfit/job/representative/hephaestus,
"Off-Duty Crew Member" = /obj/outfit/job/visitor/hephaestus,
"Engineering Personnel" = /obj/outfit/job/engineer/hephaestus,
"Operations Personnel" = /obj/outfit/job/hangar_tech/hephaestus
)
/datum/outfit/job/hangar_tech/hephaestus
/obj/outfit/job/hangar_tech/hephaestus
name = "Hangar Technician - Hephaestus"
uniform = /obj/item/clothing/under/rank/hangar_technician/heph
@@ -63,7 +63,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/heph
messengerbag_faction = /obj/item/storage/backpack/messenger/heph
/datum/outfit/job/machinist/hephaestus
/obj/outfit/job/machinist/hephaestus
name = "Machinist - Hephaestus"
uniform = /obj/item/clothing/under/rank/machinist/heph
@@ -74,7 +74,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/heph
messengerbag_faction = /obj/item/storage/backpack/messenger/heph
/datum/outfit/job/mining/hephaestus
/obj/outfit/job/mining/hephaestus
name = "Shaft Miner - Hephaestus"
uniform = /obj/item/clothing/under/rank/miner/heph
@@ -85,7 +85,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/heph
messengerbag_faction = /obj/item/storage/backpack/messenger/heph
/datum/outfit/job/engineer/hephaestus
/obj/outfit/job/engineer/hephaestus
name = "Engineer - Hephaestus"
uniform = /obj/item/clothing/under/rank/engineer/heph
@@ -97,7 +97,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/heph
messengerbag_faction = /obj/item/storage/backpack/messenger/heph
/datum/outfit/job/atmos/hephaestus
/obj/outfit/job/atmos/hephaestus
name = "Atmospheric Technician - Hephaestus"
uniform = /obj/item/clothing/under/rank/atmospheric_technician/heph
@@ -109,7 +109,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/heph
messengerbag_faction = /obj/item/storage/backpack/messenger/heph
/datum/outfit/job/intern_eng/hephaestus
/obj/outfit/job/intern_eng/hephaestus
name = "Engineering Apprentice - Hephaestus"
uniform = /obj/item/clothing/under/rank/engineer/apprentice/heph
@@ -121,7 +121,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/heph
messengerbag_faction = /obj/item/storage/backpack/messenger/heph
/datum/outfit/job/intern_atmos/hephaestus
/obj/outfit/job/intern_atmos/hephaestus
name = "Atmospherics Apprentice - Hephaestus"
uniform = /obj/item/clothing/under/rank/engineer/apprentice/heph
@@ -133,7 +133,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/heph
messengerbag_faction = /obj/item/storage/backpack/messenger/heph
/datum/outfit/job/representative/hephaestus
/obj/outfit/job/representative/hephaestus
name = "Hephaestus Corporate Liaison"
head = /obj/item/clothing/head/beret/corporate/heph
@@ -154,7 +154,7 @@
/obj/item/stamp/hephaestus = 1
)
/datum/outfit/job/journalist/hephaestus
/obj/outfit/job/journalist/hephaestus
name = "Corporate Reporter - Hephaestus"
uniform = /obj/item/clothing/under/librarian/heph
@@ -166,7 +166,7 @@
messengerbag_faction = /obj/item/storage/backpack/messenger/heph
/datum/outfit/job/visitor/hephaestus
/obj/outfit/job/visitor/hephaestus
name = "Off-Duty Crew Member - Hephaestus"
id = /obj/item/card/id/hephaestus
code/game/jobs/faction/idris.dm
+34 -34
View File
@@ -45,27 +45,27 @@
)
titles_to_loadout = list(
"Security Officer" = /datum/outfit/job/officer/idris,
"Warden" = /datum/outfit/job/warden/idris,
"Security Cadet" = /datum/outfit/job/intern_sec/officer/idris,
"Investigator Intern" = /datum/outfit/job/intern_sec/forensics/idris,
"Investigator" =/datum/outfit/job/forensics/idris,
"Bartender" = /datum/outfit/job/bartender/idris,
"Chef" = /datum/outfit/job/chef/idris,
"Gardener" = /datum/outfit/job/hydro/idris,
"Hydroponicist" = /datum/outfit/job/hydro/idris,
"Janitor" = /datum/outfit/job/janitor/idris,
"Librarian" = /datum/outfit/job/librarian/idris,
"Curator" = /datum/outfit/job/librarian/idris/curator,
"Tech Support" = /datum/outfit/job/librarian/idris/tech_support,
"Corporate Reporter" = /datum/outfit/job/journalist/idris,
"Chaplain" = /datum/outfit/job/chaplain/idris,
"Corporate Liaison" = /datum/outfit/job/representative/idris,
"Off-Duty Crew Member" = /datum/outfit/job/visitor/idris,
"Security Personnel" = /datum/outfit/job/officer/idris
"Security Officer" = /obj/outfit/job/officer/idris,
"Warden" = /obj/outfit/job/warden/idris,
"Security Cadet" = /obj/outfit/job/intern_sec/officer/idris,
"Investigator Intern" = /obj/outfit/job/intern_sec/forensics/idris,
"Investigator" =/obj/outfit/job/forensics/idris,
"Bartender" = /obj/outfit/job/bartender/idris,
"Chef" = /obj/outfit/job/chef/idris,
"Gardener" = /obj/outfit/job/hydro/idris,
"Hydroponicist" = /obj/outfit/job/hydro/idris,
"Janitor" = /obj/outfit/job/janitor/idris,
"Librarian" = /obj/outfit/job/librarian/idris,
"Curator" = /obj/outfit/job/librarian/idris/curator,
"Tech Support" = /obj/outfit/job/librarian/idris/tech_support,
"Corporate Reporter" = /obj/outfit/job/journalist/idris,
"Chaplain" = /obj/outfit/job/chaplain/idris,
"Corporate Liaison" = /obj/outfit/job/representative/idris,
"Off-Duty Crew Member" = /obj/outfit/job/visitor/idris,
"Security Personnel" = /obj/outfit/job/officer/idris
)
/datum/outfit/job/officer/idris
/obj/outfit/job/officer/idris
name = "Security Officer - Idris"
uniform = /obj/item/clothing/under/rank/security/idris
@@ -76,7 +76,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/idris
messengerbag_faction = /obj/item/storage/backpack/messenger/idris
/datum/outfit/job/warden/idris
/obj/outfit/job/warden/idris
name = "Warden - Idris"
head = /obj/item/clothing/head/warden/idris
@@ -90,7 +90,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/idris
messengerbag_faction = /obj/item/storage/backpack/messenger/idris
/datum/outfit/job/forensics/idris
/obj/outfit/job/forensics/idris
name = "Investigator - Idris"
uniform = /obj/item/clothing/under/det/idris
@@ -102,7 +102,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/idris
messengerbag_faction = /obj/item/storage/backpack/messenger/idris
/datum/outfit/job/intern_sec/officer/idris
/obj/outfit/job/intern_sec/officer/idris
name = "Security Cadet - Idris"
uniform = /obj/item/clothing/under/rank/cadet/idris
@@ -113,7 +113,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/idris
messengerbag_faction = /obj/item/storage/backpack/messenger/idris
/datum/outfit/job/intern_sec/forensics/idris
/obj/outfit/job/intern_sec/forensics/idris
name = "Investigator Intern - Idris"
uniform = /obj/item/clothing/under/rank/cadet/idris
@@ -124,7 +124,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/idris
messengerbag_faction = /obj/item/storage/backpack/messenger/idris
/datum/outfit/job/bartender/idris
/obj/outfit/job/bartender/idris
name = "Bartender - Idris"
uniform = /obj/item/clothing/under/rank/bartender/idris
@@ -137,7 +137,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/idris
messengerbag_faction = /obj/item/storage/backpack/messenger/idris
/datum/outfit/job/chef/idris
/obj/outfit/job/chef/idris
name = "Chef - Idris"
uniform = /obj/item/clothing/under/rank/chef/idris
@@ -150,7 +150,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/idris
messengerbag_faction = /obj/item/storage/backpack/messenger/idris
/datum/outfit/job/hydro/idris
/obj/outfit/job/hydro/idris
name = "Gardener - Idris"
uniform = /obj/item/clothing/under/rank/hydroponics/idris
@@ -162,7 +162,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/idris
messengerbag_faction = /obj/item/storage/backpack/messenger/idris
/datum/outfit/job/janitor/idris
/obj/outfit/job/janitor/idris
name = "Janitor - Idris"
uniform = /obj/item/clothing/under/rank/janitor/idris
@@ -174,7 +174,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/idris
messengerbag_faction = /obj/item/storage/backpack/messenger/idris
/datum/outfit/job/librarian/idris
/obj/outfit/job/librarian/idris
name = "Librarian - Idris"
uniform = /obj/item/clothing/under/librarian/idris
@@ -185,14 +185,14 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/idris
messengerbag_faction = /obj/item/storage/backpack/messenger/idris
/datum/outfit/job/librarian/idris/curator
/obj/outfit/job/librarian/idris/curator
name = "Curator - Idris"
jobtype = /datum/job/librarian
r_pocket = /obj/item/device/price_scanner
l_hand = null
/datum/outfit/job/librarian/idris/tech_support
/obj/outfit/job/librarian/idris/tech_support
name = "Tech Support - Idris"
jobtype = /datum/job/librarian
@@ -202,7 +202,7 @@
l_hand = /obj/item/modular_computer/laptop/preset
gloves = /obj/item/modular_computer/handheld/wristbound/preset/advanced/civilian
/datum/outfit/job/chaplain/idris
/obj/outfit/job/chaplain/idris
name = "Chaplain - Idris"
id = /obj/item/card/id/idris
@@ -212,7 +212,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/idris
messengerbag_faction = /obj/item/storage/backpack/messenger/idris
/datum/outfit/job/journalist/idris
/obj/outfit/job/journalist/idris
name = "Corporate Reporter - Idris"
uniform = /obj/item/clothing/under/librarian/idris
@@ -223,7 +223,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/idris
messengerbag_faction = /obj/item/storage/backpack/messenger/idris
/datum/outfit/job/representative/idris
/obj/outfit/job/representative/idris
name = "Idris Corporate Liaison"
head = /obj/item/clothing/head/beret/corporate/idris
@@ -244,7 +244,7 @@
/obj/item/stamp/idris = 1
)
/datum/outfit/job/visitor/idris
/obj/outfit/job/visitor/idris
name = "Off-Duty Crew Member - Idris"
id = /obj/item/card/id/idris
code/game/jobs/faction/nanotrasen.dm
+2 -2
View File
@@ -27,7 +27,7 @@
)
titles_to_loadout = list(
"Off-Duty Crew Member" = /datum/outfit/job/visitor/nanotrasen
"Off-Duty Crew Member" = /obj/outfit/job/visitor/nanotrasen
)
@@ -51,7 +51,7 @@
return objective
/datum/outfit/job/visitor/nanotrasen
/obj/outfit/job/visitor/nanotrasen
name = "Off-Duty Crew Member - NanoTrasen"
backpack_faction = /obj/item/storage/backpack/nt
code/game/jobs/faction/orion_express.dm
+30 -30
View File
@@ -35,25 +35,25 @@
)
)
titles_to_loadout = list(
"Hangar Technician" = /datum/outfit/job/hangar_tech/orion,
"Shaft Miner" = /datum/outfit/job/mining/orion,
"Machinist" = /datum/outfit/job/machinist/orion,
"Bartender" = /datum/outfit/job/bartender/orion,
"Chef" = /datum/outfit/job/chef/orion,
"Gardener" = /datum/outfit/job/hydro/orion,
"Hydroponicist" = /datum/outfit/job/hydro/orion,
"Janitor" = /datum/outfit/job/janitor/orion,
"Librarian" = /datum/outfit/job/librarian/orion,
"Curator" = /datum/outfit/job/librarian/orion/curator,
"Tech Support" = /datum/outfit/job/librarian/orion/tech_support,
"Corporate Reporter" = /datum/outfit/job/journalist/orion,
"Chaplain" = /datum/outfit/job/chaplain/orion,
"Corporate Liaison" = /datum/outfit/job/representative/orion,
"Off-Duty Crew Member" = /datum/outfit/job/visitor/orion,
"Operations Personnel" = /datum/outfit/job/hangar_tech/orion
"Hangar Technician" = /obj/outfit/job/hangar_tech/orion,
"Shaft Miner" = /obj/outfit/job/mining/orion,
"Machinist" = /obj/outfit/job/machinist/orion,
"Bartender" = /obj/outfit/job/bartender/orion,
"Chef" = /obj/outfit/job/chef/orion,
"Gardener" = /obj/outfit/job/hydro/orion,
"Hydroponicist" = /obj/outfit/job/hydro/orion,
"Janitor" = /obj/outfit/job/janitor/orion,
"Librarian" = /obj/outfit/job/librarian/orion,
"Curator" = /obj/outfit/job/librarian/orion/curator,
"Tech Support" = /obj/outfit/job/librarian/orion/tech_support,
"Corporate Reporter" = /obj/outfit/job/journalist/orion,
"Chaplain" = /obj/outfit/job/chaplain/orion,
"Corporate Liaison" = /obj/outfit/job/representative/orion,
"Off-Duty Crew Member" = /obj/outfit/job/visitor/orion,
"Operations Personnel" = /obj/outfit/job/hangar_tech/orion
)
/datum/outfit/job/hangar_tech/orion
/obj/outfit/job/hangar_tech/orion
name = "Hangar Technician - Orion Express"
uniform = /obj/item/clothing/under/rank/hangar_technician/orion
@@ -64,7 +64,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/orion
messengerbag_faction = /obj/item/storage/backpack/messenger/orion
/datum/outfit/job/machinist/orion
/obj/outfit/job/machinist/orion
name = "Machinist - Orion Express"
uniform = /obj/item/clothing/under/rank/machinist/orion
@@ -75,7 +75,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/orion
messengerbag_faction = /obj/item/storage/backpack/messenger/orion
/datum/outfit/job/mining/orion
/obj/outfit/job/mining/orion
name = "Shaft Miner - Orion Express"
uniform = /obj/item/clothing/under/rank/miner/orion
@@ -86,7 +86,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/orion
messengerbag_faction = /obj/item/storage/backpack/messenger/orion
/datum/outfit/job/representative/orion
/obj/outfit/job/representative/orion
name = "Orion Express Corporate Liaison"
head = /obj/item/clothing/head/beret/corporate/orion
@@ -101,7 +101,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/orion
messengerbag_faction = /obj/item/storage/backpack/messenger/orion
/datum/outfit/job/bartender/orion
/obj/outfit/job/bartender/orion
name = "Bartender - Orion Express"
uniform = /obj/item/clothing/under/rank/bartender/orion
@@ -114,7 +114,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/orion
messengerbag_faction = /obj/item/storage/backpack/messenger/orion
/datum/outfit/job/chef/orion
/obj/outfit/job/chef/orion
name = "Chef - Orion Express"
uniform = /obj/item/clothing/under/rank/chef/orion
@@ -127,7 +127,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/orion
messengerbag_faction = /obj/item/storage/backpack/messenger/orion
/datum/outfit/job/hydro/orion
/obj/outfit/job/hydro/orion
name = "Gardener - Orion Express"
uniform = /obj/item/clothing/under/rank/hydroponics/orion
@@ -139,7 +139,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/orion
messengerbag_faction = /obj/item/storage/backpack/messenger/orion
/datum/outfit/job/janitor/orion
/obj/outfit/job/janitor/orion
name = "Janitor - Orion Express"
uniform = /obj/item/clothing/under/rank/janitor/orion
@@ -151,7 +151,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/orion
messengerbag_faction = /obj/item/storage/backpack/messenger/orion
/datum/outfit/job/librarian/orion
/obj/outfit/job/librarian/orion
name = "Librarian - Orion Express"
uniform = /obj/item/clothing/under/librarian/orion
@@ -162,14 +162,14 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/orion
messengerbag_faction = /obj/item/storage/backpack/messenger/orion
/datum/outfit/job/librarian/orion/curator
/obj/outfit/job/librarian/orion/curator
name = "Curator - Orion Express"
jobtype = /datum/job/librarian
r_pocket = /obj/item/device/price_scanner
l_hand = null
/datum/outfit/job/librarian/orion/tech_support
/obj/outfit/job/librarian/orion/tech_support
name = "Tech Support - Orion Express"
jobtype = /datum/job/librarian
@@ -179,7 +179,7 @@
l_hand = /obj/item/modular_computer/laptop/preset
gloves = /obj/item/modular_computer/handheld/wristbound/preset/advanced/civilian
/datum/outfit/job/journalist/orion
/obj/outfit/job/journalist/orion
name = "Corporate Reporter - Orion Express"
uniform = /obj/item/clothing/under/librarian/orion
@@ -190,7 +190,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/orion
messengerbag_faction = /obj/item/storage/backpack/messenger/orion
/datum/outfit/job/chaplain/orion
/obj/outfit/job/chaplain/orion
name = "Chaplain - Orion Express"
id = /obj/item/card/id/orion
@@ -200,7 +200,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/orion
messengerbag_faction = /obj/item/storage/backpack/messenger/orion
/datum/outfit/job/visitor/orion
/obj/outfit/job/visitor/orion
name = "Off-Duty Crew Member - Orion Express"
id = /obj/item/card/id/orion
code/game/jobs/faction/pmc.dm
+32 -32
View File
@@ -34,26 +34,26 @@
)
titles_to_loadout = list(
"Security Officer" = /datum/outfit/job/officer/pmc,
"Warden" = /datum/outfit/job/warden/pmc,
"Security Cadet" = /datum/outfit/job/intern_sec/officer/pmc,
"Investigator Intern" = /datum/outfit/job/intern_sec/forensics/pmc,
"Investigator" =/datum/outfit/job/forensics/pmc,
"Physician" = /datum/outfit/job/doctor/pmc,
"Surgeon" = /datum/outfit/job/doctor/surgeon/pmc,
"Pharmacist" = /datum/outfit/job/pharmacist/pmc,
"Psychiatrist" = /datum/outfit/job/psychiatrist/pmc,
"Psychologist" = /datum/outfit/job/psychiatrist/pmc,
"First Responder" = /datum/outfit/job/med_tech/pmc,
"Medical Intern" = /datum/outfit/job/intern_med/pmc,
"Corporate Reporter" = /datum/outfit/job/journalist/pmc,
"Corporate Liaison" = /datum/outfit/job/representative/pmc,
"Off-Duty Crew Member" = /datum/outfit/job/visitor/pmc,
"Security Personnel" = /datum/outfit/job/officer/pmc,
"Medical Personnel" = /datum/outfit/job/med_tech/pmc
"Security Officer" = /obj/outfit/job/officer/pmc,
"Warden" = /obj/outfit/job/warden/pmc,
"Security Cadet" = /obj/outfit/job/intern_sec/officer/pmc,
"Investigator Intern" = /obj/outfit/job/intern_sec/forensics/pmc,
"Investigator" =/obj/outfit/job/forensics/pmc,
"Physician" = /obj/outfit/job/doctor/pmc,
"Surgeon" = /obj/outfit/job/doctor/surgeon/pmc,
"Pharmacist" = /obj/outfit/job/pharmacist/pmc,
"Psychiatrist" = /obj/outfit/job/psychiatrist/pmc,
"Psychologist" = /obj/outfit/job/psychiatrist/pmc,
"First Responder" = /obj/outfit/job/med_tech/pmc,
"Medical Intern" = /obj/outfit/job/intern_med/pmc,
"Corporate Reporter" = /obj/outfit/job/journalist/pmc,
"Corporate Liaison" = /obj/outfit/job/representative/pmc,
"Off-Duty Crew Member" = /obj/outfit/job/visitor/pmc,
"Security Personnel" = /obj/outfit/job/officer/pmc,
"Medical Personnel" = /obj/outfit/job/med_tech/pmc
)
/datum/outfit/job/officer/pmc
/obj/outfit/job/officer/pmc
name = "Security Officer - PMC"
uniform = /obj/item/clothing/under/rank/security/pmc
@@ -64,7 +64,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg
messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg
/datum/outfit/job/warden/pmc
/obj/outfit/job/warden/pmc
name = "Warden - PMC"
head = /obj/item/clothing/head/warden/pmc
@@ -78,7 +78,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg
messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg
/datum/outfit/job/intern_sec/officer/pmc
/obj/outfit/job/intern_sec/officer/pmc
name = "Security Cadet - PMC"
uniform = /obj/item/clothing/under/rank/cadet/pmc
@@ -89,7 +89,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg
messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg
/datum/outfit/job/intern_sec/forensics/pmc
/obj/outfit/job/intern_sec/forensics/pmc
name = "Investigator Intern - PMC"
uniform = /obj/item/clothing/under/rank/cadet/pmc
@@ -100,7 +100,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg
messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg
/datum/outfit/job/forensics/pmc
/obj/outfit/job/forensics/pmc
name = "Investigator - PMC"
uniform = /obj/item/clothing/under/det/pmc
@@ -112,7 +112,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg
messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg
/datum/outfit/job/doctor/pmc
/obj/outfit/job/doctor/pmc
name = "Physician - PMC"
uniform = /obj/item/clothing/under/rank/medical/pmc
@@ -125,7 +125,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg
messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg
/datum/outfit/job/doctor/surgeon/pmc
/obj/outfit/job/doctor/surgeon/pmc
name = "Surgeon - PMC"
uniform = /obj/item/clothing/under/rank/medical/surgeon/pmc
@@ -138,11 +138,11 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg
messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg
/datum/outfit/job/doctor/surgeon/pmc/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/doctor/surgeon/pmc/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(!isskrell(H))
H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/pmc(H), slot_head)
/datum/outfit/job/pharmacist/pmc
/obj/outfit/job/pharmacist/pmc
name = "Pharmacist - PMC"
uniform = /obj/item/clothing/under/rank/medical/pharmacist/pmc
@@ -155,7 +155,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg
messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg
/datum/outfit/job/psychiatrist/pmc
/obj/outfit/job/psychiatrist/pmc
name = "Psychiatrist - PMC"
uniform = /obj/item/clothing/under/rank/medical/psych/pmc
@@ -167,7 +167,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg
messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg
/datum/outfit/job/med_tech/pmc
/obj/outfit/job/med_tech/pmc
name = "First Responder - PMC"
head = /obj/item/clothing/head/softcap/pmc
@@ -180,7 +180,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg
messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg
/datum/outfit/job/intern_med/pmc
/obj/outfit/job/intern_med/pmc
name = "Medical Intern - PMC"
uniform = /obj/item/clothing/under/rank/medical/intern/pmc
@@ -192,7 +192,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg
messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg
/datum/outfit/job/representative/pmc
/obj/outfit/job/representative/pmc
name = "PMC Corporate Liaison"
head = /obj/item/clothing/head/beret/corporate/pmc
@@ -207,7 +207,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg
messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg
/datum/outfit/job/journalist/pmc
/obj/outfit/job/journalist/pmc
name = "Corporate Reporter - PMC"
uniform = /obj/item/clothing/under/librarian/pmc
@@ -218,7 +218,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg
messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg
/datum/outfit/job/visitor/pmc
/obj/outfit/job/visitor/pmc
name = "Off-Duty Crew Member - PMC"
id = /obj/item/card/id/pmc
code/game/jobs/faction/zavodskoi.dm
+37 -37
View File
@@ -46,29 +46,29 @@
)
titles_to_loadout = list(
"Security Officer" = /datum/outfit/job/officer/zavodskoi,
"Warden" = /datum/outfit/job/warden/zavodskoi,
"Security Cadet" = /datum/outfit/job/intern_sec/officer/zavodskoi,
"Investigator Intern" = /datum/outfit/job/intern_sec/forensics/zavodskoi,
"Investigator" =/datum/outfit/job/forensics/zavodskoi,
"Scientist" = /datum/outfit/job/scientist/zavodskoi,
"Xenobiologist" = /datum/outfit/job/scientist/xenobiologist/zavodskoi,
"Xenobotanist" = /datum/outfit/job/scientist/xenobotanist/zavodskoi,
"Lab Assistant" = /datum/outfit/job/intern_sci/zavodskoi,
"Xenoarchaeologist"= /datum/outfit/job/scientist/xenoarchaeologist/zavodskoi,
"Engineer" = /datum/outfit/job/engineer/zavodskoi,
"Atmospheric Technician" = /datum/outfit/job/atmos/zavodskoi,
"Engineering Apprentice" = /datum/outfit/job/intern_eng/zavodskoi,
"Atmospherics Apprentice" = /datum/outfit/job/intern_atmos/zavodskoi,
"Corporate Reporter" = /datum/outfit/job/journalist/zavodskoi,
"Corporate Liaison" = /datum/outfit/job/representative/zavodskoi,
"Off-Duty Crew Member" = /datum/outfit/job/visitor/zavodskoi,
"Security Personnel" = /datum/outfit/job/officer/zavodskoi,
"Engineering Personnel" = /datum/outfit/job/engineer/zavodskoi,
"Science Personnel" = /datum/outfit/job/scientist/zavodskoi
"Security Officer" = /obj/outfit/job/officer/zavodskoi,
"Warden" = /obj/outfit/job/warden/zavodskoi,
"Security Cadet" = /obj/outfit/job/intern_sec/officer/zavodskoi,
"Investigator Intern" = /obj/outfit/job/intern_sec/forensics/zavodskoi,
"Investigator" =/obj/outfit/job/forensics/zavodskoi,
"Scientist" = /obj/outfit/job/scientist/zavodskoi,
"Xenobiologist" = /obj/outfit/job/scientist/xenobiologist/zavodskoi,
"Xenobotanist" = /obj/outfit/job/scientist/xenobotanist/zavodskoi,
"Lab Assistant" = /obj/outfit/job/intern_sci/zavodskoi,
"Xenoarchaeologist"= /obj/outfit/job/scientist/xenoarchaeologist/zavodskoi,
"Engineer" = /obj/outfit/job/engineer/zavodskoi,
"Atmospheric Technician" = /obj/outfit/job/atmos/zavodskoi,
"Engineering Apprentice" = /obj/outfit/job/intern_eng/zavodskoi,
"Atmospherics Apprentice" = /obj/outfit/job/intern_atmos/zavodskoi,
"Corporate Reporter" = /obj/outfit/job/journalist/zavodskoi,
"Corporate Liaison" = /obj/outfit/job/representative/zavodskoi,
"Off-Duty Crew Member" = /obj/outfit/job/visitor/zavodskoi,
"Security Personnel" = /obj/outfit/job/officer/zavodskoi,
"Engineering Personnel" = /obj/outfit/job/engineer/zavodskoi,
"Science Personnel" = /obj/outfit/job/scientist/zavodskoi
)
/datum/outfit/job/officer/zavodskoi
/obj/outfit/job/officer/zavodskoi
name = "Security Officer - Zavodskoi Interstellar"
uniform = /obj/item/clothing/under/rank/security/zavod
@@ -79,7 +79,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zavod
messengerbag_faction = /obj/item/storage/backpack/messenger/zavod
/datum/outfit/job/warden/zavodskoi
/obj/outfit/job/warden/zavodskoi
name = "Warden - Zavodskoi Interstellar"
head = /obj/item/clothing/head/warden/zavod
@@ -93,7 +93,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zavod
messengerbag_faction = /obj/item/storage/backpack/messenger/zavod
/datum/outfit/job/intern_sec/officer/zavodskoi
/obj/outfit/job/intern_sec/officer/zavodskoi
name = "Security Cadet - Zavodskoi Interstellar"
uniform = /obj/item/clothing/under/rank/cadet/zavod
@@ -104,7 +104,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zavod
messengerbag_faction = /obj/item/storage/backpack/messenger/zavod
/datum/outfit/job/intern_sec/forensics/zavodskoi
/obj/outfit/job/intern_sec/forensics/zavodskoi
name = "Investigator Intern - Zavodskoi Interstellar"
uniform = /obj/item/clothing/under/rank/cadet/zavod
@@ -115,7 +115,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zavod
messengerbag_faction = /obj/item/storage/backpack/messenger/zavod
/datum/outfit/job/forensics/zavodskoi
/obj/outfit/job/forensics/zavodskoi
name = "Investigator - Zavodskoi Interstellar"
id = /obj/item/card/id/zavodskoi/sec
@@ -127,7 +127,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zavod
messengerbag_faction = /obj/item/storage/backpack/messenger/zavod
/datum/outfit/job/scientist/zavodskoi
/obj/outfit/job/scientist/zavodskoi
name = "Scientist - Zavodskoi Interstellar"
uniform = /obj/item/clothing/under/rank/scientist/zavod
@@ -140,7 +140,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zavod
messengerbag_faction = /obj/item/storage/backpack/messenger/zavod
/datum/outfit/job/scientist/xenobiologist/zavodskoi
/obj/outfit/job/scientist/xenobiologist/zavodskoi
name = "Xenobiologist - Zavodskoi Interstellar"
uniform = /obj/item/clothing/under/rank/scientist/xenobio/zavod
@@ -153,7 +153,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zavod
messengerbag_faction = /obj/item/storage/backpack/messenger/zavod
/datum/outfit/job/scientist/xenobotanist/zavodskoi
/obj/outfit/job/scientist/xenobotanist/zavodskoi
name = "Xenobotanist - Zavodskoi Interstellar"
uniform = /obj/item/clothing/under/rank/scientist/botany/zavod
@@ -161,7 +161,7 @@
id = /obj/item/card/id/zavodskoi
shoes = /obj/item/clothing/shoes/sneakers/medsci/zavod
/datum/outfit/job/scientist/xenoarchaeologist/zavodskoi
/obj/outfit/job/scientist/xenoarchaeologist/zavodskoi
name = "Xenoarchaeologist - Zavodskoi Interstellar"
uniform = /obj/item/clothing/under/rank/scientist/xenoarchaeologist/zavod
@@ -174,7 +174,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zavod
messengerbag_faction = /obj/item/storage/backpack/messenger/zavod
/datum/outfit/job/intern_sci/zavodskoi
/obj/outfit/job/intern_sci/zavodskoi
name = "Lab Assistant - Zavodskoi Interstellar"
uniform = /obj/item/clothing/under/rank/scientist/intern/zavod
@@ -186,7 +186,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zavod
messengerbag_faction = /obj/item/storage/backpack/messenger/zavod
/datum/outfit/job/engineer/zavodskoi
/obj/outfit/job/engineer/zavodskoi
name = "Engineer - Zavodskoi Interstellar"
uniform = /obj/item/clothing/under/rank/engineer/zavod
@@ -198,7 +198,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zavod
messengerbag_faction = /obj/item/storage/backpack/messenger/zavod
/datum/outfit/job/atmos/zavodskoi
/obj/outfit/job/atmos/zavodskoi
name = "Atmospheric Technician - Zavodskoi Interstellar"
uniform = /obj/item/clothing/under/rank/atmospheric_technician/zavod
@@ -210,7 +210,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zavod
messengerbag_faction = /obj/item/storage/backpack/messenger/zavod
/datum/outfit/job/intern_eng/zavodskoi
/obj/outfit/job/intern_eng/zavodskoi
name = "Engineering Apprentice - Zavodskoi Interstellar"
uniform = /obj/item/clothing/under/rank/engineer/apprentice/zavod
@@ -222,7 +222,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zavod
messengerbag_faction = /obj/item/storage/backpack/messenger/zavod
/datum/outfit/job/intern_atmos/zavodskoi
/obj/outfit/job/intern_atmos/zavodskoi
name = "Atmospherics Apprentice - Zavodskoi Interstellar"
uniform = /obj/item/clothing/under/rank/engineer/apprentice/zavod
@@ -234,7 +234,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zavod
messengerbag_faction = /obj/item/storage/backpack/messenger/zavod
/datum/outfit/job/representative/zavodskoi
/obj/outfit/job/representative/zavodskoi
name = "Zavodskoi Interstellar Corporate Liaison"
head = /obj/item/clothing/head/beret/corporate/zavod
@@ -255,7 +255,7 @@
/obj/item/stamp/zavodskoi = 1
)
/datum/outfit/job/journalist/zavodskoi
/obj/outfit/job/journalist/zavodskoi
name = "Corporate Reporter - Zavodskoi Interstellar"
uniform = /obj/item/clothing/under/librarian/zavod
@@ -266,7 +266,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zavod
messengerbag_faction = /obj/item/storage/backpack/messenger/zavod
/datum/outfit/job/visitor/zavodskoi
/obj/outfit/job/visitor/zavodskoi
name = "Off-Duty Crew Member - Zavodskoi Interstellar"
id = /obj/item/card/id/zavodskoi
code/game/jobs/faction/zeng_hu.dm
+32 -32
View File
@@ -40,26 +40,26 @@
)
titles_to_loadout = list(
"Physician" = /datum/outfit/job/doctor/zeng_hu,
"Surgeon" = /datum/outfit/job/doctor/surgeon/zeng_hu,
"Pharmacist" = /datum/outfit/job/pharmacist/zeng_hu,
"Psychiatrist" = /datum/outfit/job/psychiatrist/zeng_hu,
"Psychologist" = /datum/outfit/job/psychiatrist/zeng_hu,
"First Responder" = /datum/outfit/job/med_tech/zeng_hu,
"Medical Intern" = /datum/outfit/job/intern_med/zeng_hu,
"Scientist" = /datum/outfit/job/scientist/zeng_hu,
"Xenobiologist" = /datum/outfit/job/scientist/xenobiologist/zeng_hu,
"Xenobotanist" = /datum/outfit/job/scientist/xenobotanist/zeng_hu,
"Lab Assistant" = /datum/outfit/job/intern_sci/zeng_hu,
"Xenoarchaeologist"= /datum/outfit/job/scientist/xenoarchaeologist/zeng_hu,
"Corporate Reporter" = /datum/outfit/job/journalist/zeng_hu,
"Corporate Liaison" = /datum/outfit/job/representative/zeng_hu,
"Off-Duty Crew Member" = /datum/outfit/job/visitor/zeng_hu,
"Science Personnel" = /datum/outfit/job/scientist/zeng_hu,
"Medical Personnel" = /datum/outfit/job/med_tech/zeng_hu
"Physician" = /obj/outfit/job/doctor/zeng_hu,
"Surgeon" = /obj/outfit/job/doctor/surgeon/zeng_hu,
"Pharmacist" = /obj/outfit/job/pharmacist/zeng_hu,
"Psychiatrist" = /obj/outfit/job/psychiatrist/zeng_hu,
"Psychologist" = /obj/outfit/job/psychiatrist/zeng_hu,
"First Responder" = /obj/outfit/job/med_tech/zeng_hu,
"Medical Intern" = /obj/outfit/job/intern_med/zeng_hu,
"Scientist" = /obj/outfit/job/scientist/zeng_hu,
"Xenobiologist" = /obj/outfit/job/scientist/xenobiologist/zeng_hu,
"Xenobotanist" = /obj/outfit/job/scientist/xenobotanist/zeng_hu,
"Lab Assistant" = /obj/outfit/job/intern_sci/zeng_hu,
"Xenoarchaeologist"= /obj/outfit/job/scientist/xenoarchaeologist/zeng_hu,
"Corporate Reporter" = /obj/outfit/job/journalist/zeng_hu,
"Corporate Liaison" = /obj/outfit/job/representative/zeng_hu,
"Off-Duty Crew Member" = /obj/outfit/job/visitor/zeng_hu,
"Science Personnel" = /obj/outfit/job/scientist/zeng_hu,
"Medical Personnel" = /obj/outfit/job/med_tech/zeng_hu
)
/datum/outfit/job/doctor/zeng_hu
/obj/outfit/job/doctor/zeng_hu
name = "Physician - Zeng-Hu"
uniform = /obj/item/clothing/under/rank/medical/zeng
@@ -72,7 +72,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zeng
messengerbag_faction = /obj/item/storage/backpack/messenger/zeng
/datum/outfit/job/doctor/surgeon/zeng_hu
/obj/outfit/job/doctor/surgeon/zeng_hu
name = "Surgeon - Zeng-Hu"
uniform = /obj/item/clothing/under/rank/medical/surgeon/zeng
@@ -85,11 +85,11 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zeng
messengerbag_faction = /obj/item/storage/backpack/messenger/zeng
/datum/outfit/job/doctor/surgeon/zeng_hu/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/doctor/surgeon/zeng_hu/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(!isskrell(H))
H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/zeng(H), slot_head)
/datum/outfit/job/pharmacist/zeng_hu
/obj/outfit/job/pharmacist/zeng_hu
name = "Pharmacist - Zeng-Hu"
uniform = /obj/item/clothing/under/rank/medical/pharmacist/zeng
@@ -102,7 +102,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zeng
messengerbag_faction = /obj/item/storage/backpack/messenger/zeng
/datum/outfit/job/psychiatrist/zeng_hu
/obj/outfit/job/psychiatrist/zeng_hu
name = "Psychiatrist - Zeng-Hu"
uniform = /obj/item/clothing/under/rank/medical/psych/zeng
@@ -115,7 +115,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zeng
messengerbag_faction = /obj/item/storage/backpack/messenger/zeng
/datum/outfit/job/med_tech/zeng_hu
/obj/outfit/job/med_tech/zeng_hu
name = "First Responder - Zeng-Hu"
head = /obj/item/clothing/head/softcap/zeng
@@ -128,7 +128,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zeng
messengerbag_faction = /obj/item/storage/backpack/messenger/zeng
/datum/outfit/job/intern_med/zeng_hu
/obj/outfit/job/intern_med/zeng_hu
name = "Medical Intern - Zeng-Hu"
uniform = /obj/item/clothing/under/rank/medical/intern/zeng
@@ -140,7 +140,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zeng
messengerbag_faction = /obj/item/storage/backpack/messenger/zeng
/datum/outfit/job/scientist/zeng_hu
/obj/outfit/job/scientist/zeng_hu
name = "Scientist - Zeng-Hu"
uniform = /obj/item/clothing/under/rank/scientist/zeng
@@ -153,7 +153,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zeng
messengerbag_faction = /obj/item/storage/backpack/messenger/zeng
/datum/outfit/job/scientist/xenobiologist/zeng_hu
/obj/outfit/job/scientist/xenobiologist/zeng_hu
name = "Xenobiologist - Zeng-Hu"
uniform = /obj/item/clothing/under/rank/scientist/xenobio/zeng
@@ -166,7 +166,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zeng
messengerbag_faction = /obj/item/storage/backpack/messenger/zeng
/datum/outfit/job/scientist/xenobotanist/zeng_hu
/obj/outfit/job/scientist/xenobotanist/zeng_hu
name = "Xenobotanist - Zeng-Hu"
uniform = /obj/item/clothing/under/rank/scientist/botany/zeng
@@ -179,7 +179,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zeng
messengerbag_faction = /obj/item/storage/backpack/messenger/zeng
/datum/outfit/job/scientist/xenoarchaeologist/zeng_hu
/obj/outfit/job/scientist/xenoarchaeologist/zeng_hu
name = "Xenoarchaeologist - Zeng-Hu"
uniform = /obj/item/clothing/under/rank/scientist/xenoarchaeologist/zeng
@@ -192,7 +192,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zeng
messengerbag_faction = /obj/item/storage/backpack/messenger/zeng
/datum/outfit/job/intern_sci/zeng_hu
/obj/outfit/job/intern_sci/zeng_hu
name = "Lab Assistant - Zeng-Hu"
uniform = /obj/item/clothing/under/rank/scientist/intern/zeng
@@ -204,7 +204,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zeng
messengerbag_faction = /obj/item/storage/backpack/messenger/zeng
/datum/outfit/job/representative/zeng_hu
/obj/outfit/job/representative/zeng_hu
name = "Zeng-Hu Corporate Liaison"
head = /obj/item/clothing/head/beret/corporate/zeng
@@ -224,7 +224,7 @@
/obj/item/gun/energy/pistol = 1,
/obj/item/stamp/zeng_hu = 1
)
/datum/outfit/job/journalist/zeng_hu
/obj/outfit/job/journalist/zeng_hu
name = "Corporate Reporter - Zeng-Hu"
uniform = /obj/item/clothing/under/librarian/zeng
@@ -235,7 +235,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/zeng
messengerbag_faction = /obj/item/storage/backpack/messenger/zeng
/datum/outfit/job/visitor/zeng_hu
/obj/outfit/job/visitor/zeng_hu
name = "Off-Duty Crew Member - Zeng-Hu"
id = /obj/item/card/id/zeng_hu
code/game/jobs/job/captain.dm
+7 -7
View File
@@ -28,11 +28,11 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
SPECIES_SKRELL_AXIORI = 120
) // Old geezer captains ftw
outfit = /datum/outfit/job/captain
outfit = /obj/outfit/job/captain
blacklisted_species = list(SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_UNATHI, SPECIES_DIONA, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_DIONA, SPECIES_DIONA_COEUS)
/datum/outfit/job/captain
/obj/outfit/job/captain
name = "Captain"
jobtype = /datum/job/captain
@@ -64,7 +64,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
dufflebag = /obj/item/storage/backpack/duffel/cap
messengerbag = /obj/item/storage/backpack/messenger/com
/datum/outfit/job/captain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/captain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(H && H.w_uniform)
var/obj/item/clothing/under/U = H.w_uniform
@@ -106,7 +106,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
SPECIES_SKRELL_AXIORI = 80
)
outfit = /datum/outfit/job/xo
outfit = /obj/outfit/job/xo
access = list(ACCESS_SEC_DOORS, ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_SHIP_WEAPONS, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS,
ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION,
@@ -120,7 +120,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER)
/datum/outfit/job/xo
/obj/outfit/job/xo
name = "Executive Officer"
jobtype = /datum/job/xo
@@ -169,14 +169,14 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
SPECIES_SKRELL_AXIORI = 55
)
outfit = /datum/outfit/job/bridge_crew
outfit = /obj/outfit/job/bridge_crew
access = list(ACCESS_EVA, ACCESS_HEADS, ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS, ACCESS_BRIDGE_CREW, ACCESS_INTREPID, ACCESS_TELEPORTER, ACCESS_EXTERNAL_AIRLOCKS)
minimal_access = list(ACCESS_HEADS, ACCESS_EVA, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_BRIDGE_CREW, ACCESS_INTREPID, ACCESS_TELEPORTER, ACCESS_EXTERNAL_AIRLOCKS)
blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER)
/datum/outfit/job/bridge_crew
/obj/outfit/job/bridge_crew
name = "Bridge Crew"
jobtype = /datum/job/bridge_crew
code/game/jobs/job/civilian.dm
+26 -26
View File
@@ -18,10 +18,10 @@
access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN)
minimal_access = list(ACCESS_BAR)
alt_titles = list("Barista")
outfit = /datum/outfit/job/bartender
outfit = /obj/outfit/job/bartender
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
/datum/outfit/job/bartender
/obj/outfit/job/bartender
name = "Bartender"
jobtype = /datum/job/bartender
@@ -64,10 +64,10 @@
access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN)
minimal_access = list(ACCESS_KITCHEN)
alt_titles = list("Cook")
outfit = /datum/outfit/job/chef
outfit = /obj/outfit/job/chef
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
/datum/outfit/job/chef
/obj/outfit/job/chef
name = "Chef"
jobtype = /datum/job/chef
@@ -113,11 +113,11 @@
access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN)
minimal_access = list(ACCESS_HYDROPONICS)
outfit = /datum/outfit/job/hydro
outfit = /obj/outfit/job/hydro
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
alt_titles = list("Hydroponicist")
/datum/outfit/job/hydro
/obj/outfit/job/hydro
name = "Gardener"
jobtype = /datum/job/hydro
@@ -144,7 +144,7 @@
messengerbag = /obj/item/storage/backpack/messenger/hyd
messengerbag_faction = /obj/item/storage/backpack/messenger/nt
/datum/outfit/job/hydro/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/hydro/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(istajara(H))
H.equip_or_collect(new /obj/item/clothing/gloves/botanic_leather/tajara(H), slot_gloves)
@@ -165,11 +165,11 @@
selection_color = "#90524b"
access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_MEDICAL)
minimal_access = list(ACCESS_JANITOR, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_MEDICAL)
outfit = /datum/outfit/job/janitor
outfit = /obj/outfit/job/janitor
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
/datum/outfit/job/janitor
/obj/outfit/job/janitor
name = "Janitor"
jobtype = /datum/job/janitor
@@ -204,13 +204,13 @@
access = list(ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS)
minimal_access = list(ACCESS_LIBRARY)
alt_titles = list("Curator", "Tech Support")
alt_outfits = list("Curator" = /datum/outfit/job/librarian/curator, "Tech Support" = /datum/outfit/job/librarian/tech_support)
alt_outfits = list("Curator" = /obj/outfit/job/librarian/curator, "Tech Support" = /obj/outfit/job/librarian/tech_support)
title_accesses = list("Tech Support" = ACCESS_IT)
outfit = /datum/outfit/job/librarian
outfit = /obj/outfit/job/librarian
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
/datum/outfit/job/librarian
/obj/outfit/job/librarian
name = "Librarian"
jobtype = /datum/job/librarian
@@ -233,7 +233,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/nt
messengerbag_faction = /obj/item/storage/backpack/messenger/nt
/datum/outfit/job/librarian/curator
/obj/outfit/job/librarian/curator
name = "Curator"
jobtype = /datum/job/librarian
@@ -241,7 +241,7 @@
r_pocket = /obj/item/device/price_scanner
l_hand = null
/datum/outfit/job/librarian/tech_support
/obj/outfit/job/librarian/tech_support
name = "Tech Support"
jobtype = /datum/job/librarian
@@ -252,7 +252,7 @@
l_hand = /obj/item/modular_computer/laptop/preset
gloves = /obj/item/modular_computer/handheld/wristbound/preset/advanced/civilian
/datum/outfit/job/librarian/tech_support/equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/librarian/tech_support/equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(visualsOnly)
r_hand = null
else
@@ -272,11 +272,11 @@
access = list(ACCESS_CHAPEL_OFFICE, ACCESS_MAINT_TUNNELS)
minimal_access = list(ACCESS_CHAPEL_OFFICE)
alt_titles = list("Presbyter", "Rabbi", "Imam", "Priest", "Shaman", "Counselor")
outfit = /datum/outfit/job/chaplain
outfit = /obj/outfit/job/chaplain
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
/datum/outfit/job/chaplain
/obj/outfit/job/chaplain
name = "Chaplain"
jobtype = /datum/job/chaplain
uniform = /obj/item/clothing/under/rank/chaplain
@@ -296,7 +296,7 @@
dufflebag_faction = /obj/item/storage/backpack/duffel/nt
messengerbag_faction = /obj/item/storage/backpack/messenger/nt
/datum/outfit/job/chaplain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/chaplain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
@@ -352,11 +352,11 @@
SPECIES_SKRELL_AXIORI = 90
)
outfit = /datum/outfit/job/operations_manager
outfit = /obj/outfit/job/operations_manager
blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER)
/datum/outfit/job/operations_manager
/obj/outfit/job/operations_manager
name = "Operations Manager"
jobtype = /datum/job/operations_manager
@@ -400,11 +400,11 @@
access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_SHIP_WEAPONS, ACCESS_CARGO_BOT, ACCESS_MINING, ACCESS_MINING_STATION)
minimal_access = list(ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_SHIP_WEAPONS, ACCESS_MAILSORTING)
outfit = /datum/outfit/job/hangar_tech
outfit = /obj/outfit/job/hangar_tech
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
/datum/outfit/job/hangar_tech
/obj/outfit/job/hangar_tech
name = "Hangar Technician"
jobtype = /datum/job/hangar_tech
@@ -441,11 +441,11 @@
access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MINING, ACCESS_MINING_STATION)
minimal_access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MAILSORTING)
outfit = /datum/outfit/job/mining
outfit = /obj/outfit/job/mining
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
/datum/outfit/job/mining
/obj/outfit/job/mining
name = "Shaft Miner"
jobtype = /datum/job/mining
@@ -496,11 +496,11 @@
minimal_player_age = 7
outfit = /datum/outfit/job/machinist
outfit = /obj/outfit/job/machinist
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
/datum/outfit/job/machinist
/obj/outfit/job/machinist
name = "Machinist"
jobtype = /datum/job/machinist
code/game/jobs/job/engineering.dm
+13 -13
View File
@@ -35,11 +35,11 @@
ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_AI_UPLOAD, ACCESS_IT, ACCESS_BRIDGE_CREW, ACCESS_INTREPID, ACCESS_NETWORK)
minimal_player_age = 7
outfit = /datum/outfit/job/chief_engineer
outfit = /obj/outfit/job/chief_engineer
blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER)
/datum/outfit/job/chief_engineer
/obj/outfit/job/chief_engineer
name = "Chief Engineer"
jobtype = /datum/job/chief_engineer
box = /obj/item/storage/box/survival/engineer
@@ -65,7 +65,7 @@
dufflebag = /obj/item/storage/backpack/duffel/ce
messengerbag = /obj/item/storage/backpack/messenger/ce
/datum/outfit/job/chief_engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/chief_engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(istajara(H))
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/workboots/toeless(H), slot_shoes)
@@ -97,11 +97,11 @@
access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_SHIP_WEAPONS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_LEVIATHAN)
minimal_access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_SHIP_WEAPONS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_LEVIATHAN)
outfit = /datum/outfit/job/engineer
outfit = /obj/outfit/job/engineer
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
/datum/outfit/job/engineer
/obj/outfit/job/engineer
name = "Engineer"
jobtype = /datum/job/engineer
box = /obj/item/storage/box/survival/engineer
@@ -135,7 +135,7 @@
/obj/item/powerdrill = 1
)
/datum/outfit/job/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(istajara(H))
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/workboots/toeless(H), slot_shoes)
@@ -165,10 +165,10 @@
access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_LEVIATHAN)
minimal_access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_LEVIATHAN)
outfit = /datum/outfit/job/atmos
outfit = /obj/outfit/job/atmos
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
/datum/outfit/job/atmos
/obj/outfit/job/atmos
name = "Atmospheric Technician"
jobtype = /datum/job/atmos
box = /obj/item/storage/box/survival/engineer
@@ -202,7 +202,7 @@
/obj/item/powerdrill = 1
)
/datum/outfit/job/atmos/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/atmos/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(istajara(H))
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/workboots/toeless(H), slot_shoes)
@@ -218,7 +218,7 @@
department_flag = ENGSEC
faction = "Station"
alt_titles = list("Atmospherics Apprentice")
alt_outfits = list("Atmospherics Apprentice" = /datum/outfit/job/intern_atmos)
alt_outfits = list("Atmospherics Apprentice" = /obj/outfit/job/intern_atmos)
total_positions = 3
spawn_positions = 3
intro_prefix = "an"
@@ -226,7 +226,7 @@
selection_color = "#c67519"
access = list(ACCESS_MAINT_TUNNELS, ACCESS_CONSTRUCTION, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE)
minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CONSTRUCTION, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE)
outfit = /datum/outfit/job/intern_eng
outfit = /obj/outfit/job/intern_eng
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
minimum_character_age = list(
@@ -235,7 +235,7 @@
SPECIES_SKRELL_AXIORI = 58
)
/datum/outfit/job/intern_eng
/obj/outfit/job/intern_eng
name = "Engineering Apprentice"
jobtype = /datum/job/intern_eng
box = /obj/item/storage/box/survival/engineer
@@ -267,7 +267,7 @@
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/engineering
tablet = /obj/item/modular_computer/handheld/preset/engineering
/datum/outfit/job/intern_atmos
/obj/outfit/job/intern_atmos
name = "Atmospherics Apprentice"
jobtype = /datum/job/intern_eng
box = /obj/item/storage/box/survival/engineer
code/game/jobs/job/event.dm
+5 -5
View File
@@ -20,7 +20,7 @@
access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_WEAPONS)
minimal_access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_WEAPONS)
minimal_player_age = 7
outfit = /datum/outfit/job/officer
outfit = /obj/outfit/job/officer
blacklisted_species = list(SPECIES_IPC_ZENGHU, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_XION_REMOTE, SPECIES_VAURCA_BULWARK, SPECIES_DIONA_COEUS, SPECIES_VAURCA_BREEDER)
@@ -44,7 +44,7 @@
access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PSYCHIATRIST, ACCESS_FIRST_RESPONDER)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_FIRST_RESPONDER)
outfit = /datum/outfit/job/med_tech
outfit = /obj/outfit/job/med_tech
blacklisted_species = list(SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_IPC_G2, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER)
@@ -68,7 +68,7 @@
access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_SHIP_WEAPONS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_LEVIATHAN)
minimal_access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_SHIP_WEAPONS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_LEVIATHAN)
outfit = /datum/outfit/job/engineer
outfit = /obj/outfit/job/engineer
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
@@ -94,7 +94,7 @@
minimal_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_INTREPID)
minimal_player_age = 14
outfit = /datum/outfit/job/scientist
outfit = /obj/outfit/job/scientist
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
/datum/job/eventops
@@ -116,6 +116,6 @@
access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_SHIP_WEAPONS, ACCESS_CARGO_BOT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_ROBOTICS)
minimal_access = list(ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_SHIP_WEAPONS, ACCESS_MAILSORTING)
outfit = /datum/outfit/job/hangar_tech
outfit = /obj/outfit/job/hangar_tech
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
code/game/jobs/job/hra.dm
+3 -3
View File
@@ -23,11 +23,11 @@
minimal_access = list(ACCESS_SEC_DOORS, ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_EVA, ACCESS_HEADS, ACCESS_MAINT_TUNNELS,
ACCESS_CONSTRUCTION, ACCESS_RESEARCH, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_BRIDGE_CREW, ACCESS_INTREPID, ACCESS_CENT_CCIA)
outfit = /datum/outfit/job/hra
outfit = /obj/outfit/job/hra
blacklisted_species = list(SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_UNATHI, SPECIES_DIONA, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_DIONA, SPECIES_DIONA_COEUS)
/datum/outfit/job/hra
/obj/outfit/job/hra
name = "Human Resources Assistant"
jobtype = /datum/job/hra
@@ -61,7 +61,7 @@
/obj/item/modular_computer/laptop/preset/command = 1,
)
/datum/outfit/job/hra/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/hra/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(H && H.w_uniform)
var/obj/item/clothing/under/U = H.w_uniform
code/game/jobs/job/job.dm
+8 -8
View File
@@ -39,8 +39,8 @@
var/economic_modifier = 2 // With how much does this job modify the initial account amount?
var/create_record = TRUE // Do we announce/make records for people who spawn on this job?
var/datum/outfit/outfit = null
var/list/alt_outfits = null // A list of special outfits for the alt titles list("alttitle" = /datum/outfit)
var/obj/outfit/outfit = null
var/list/alt_outfits = null // A list of special outfits for the alt titles list("alttitle" = /obj/outfit)
var/list/blacklisted_species = null // A blacklist of species that can't be this job
var/list/blacklisted_citizenship = list() //A blacklist of citizenships that can't be this job
@@ -137,7 +137,7 @@
if(!F.is_default)
var/new_outfit = F.titles_to_loadout[title]
if(ispath(new_outfit))
var/datum/outfit/O = new new_outfit
var/obj/outfit/O = new new_outfit
O.pre_equip(H, TRUE)
O.equip(H, TRUE)
return
@@ -207,7 +207,7 @@
/datum/job/proc/has_alt_title(var/mob/H, var/supplied_title, var/desired_title)
return (supplied_title == desired_title) || (H.mind && H.mind.role_alt_title == desired_title)
/datum/outfit/job
/obj/outfit/job
name = "Standard Gear"
var/base_name = null
collect_not_del = FALSE
@@ -234,7 +234,7 @@
var/box = /obj/item/storage/box/survival
/datum/outfit/job/equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/equip(mob/living/carbon/human/H, visualsOnly = FALSE)
back = null //Nulling the backpack here, since we already equipped the backpack in pre_equip
if(box)
var/spawnbox = box
@@ -242,16 +242,16 @@
backpack_contents[spawnbox] = 1
. = ..()
/datum/outfit/job/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
/datum/outfit/job/get_id_access(mob/living/carbon/human/H)
/obj/outfit/job/get_id_access(mob/living/carbon/human/H)
var/datum/job/J = SSjobs.GetJobType(jobtype)
if(!J)
J = SSjobs.GetJob(H.job)
return J.get_access(get_id_assignment(H, TRUE))
/datum/outfit/job/get_id_rank(mob/living/carbon/human/H)
/obj/outfit/job/get_id_rank(mob/living/carbon/human/H)
var/datum/job/J = SSjobs.GetJobType(jobtype)
if(!J)
J = SSjobs.GetJob(H.job)
code/game/jobs/job/medical.dm
+23 -23
View File
@@ -32,11 +32,11 @@
SPECIES_SKRELL = 100,
SPECIES_SKRELL_AXIORI = 100
)
outfit = /datum/outfit/job/cmo
outfit = /obj/outfit/job/cmo
blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER)
/datum/outfit/job/cmo
/obj/outfit/job/cmo
name = "Chief Medical Officer"
jobtype = /datum/job/cmo
@@ -81,7 +81,7 @@
access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_EVA)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_EVA)
outfit = /datum/outfit/job/doctor
outfit = /obj/outfit/job/doctor
blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER)
/datum/job/surgeon
@@ -105,10 +105,10 @@
access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_EVA)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_EVA)
outfit = /datum/outfit/job/doctor/surgeon
outfit = /obj/outfit/job/doctor/surgeon
blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER)
/datum/outfit/job/doctor
/obj/outfit/job/doctor
name = "Physician"
base_name = "Physician"
jobtype = /datum/job/doctor
@@ -137,7 +137,7 @@
messengerbag = /obj/item/storage/backpack/messenger/med
messengerbag_faction = /obj/item/storage/backpack/messenger/nt
/datum/outfit/job/doctor/surgeon
/obj/outfit/job/doctor/surgeon
name = "Surgeon"
jobtype = /datum/job/surgeon
@@ -145,7 +145,7 @@
suit = /obj/item/clothing/suit/storage/toggle/labcoat/nt
shoes = /obj/item/clothing/shoes/sneakers/medsci
/datum/outfit/job/doctor/surgeon/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/doctor/surgeon/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(!isskrell(H))
H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery(H), slot_head)
@@ -169,10 +169,10 @@
access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_GENETICS)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_PHARMACY, ACCESS_VIROLOGY)
outfit = /datum/outfit/job/pharmacist
outfit = /obj/outfit/job/pharmacist
blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER)
/datum/outfit/job/pharmacist
/obj/outfit/job/pharmacist
name = "Pharmacist"
jobtype = /datum/job/pharmacist
@@ -220,11 +220,11 @@
access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_PSYCHIATRIST)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_PSYCHIATRIST)
alt_titles = list("Psychologist")
outfit = /datum/outfit/job/psychiatrist
alt_outfits = list("Psychologist" = /datum/outfit/job/psychiatrist/psycho)
outfit = /obj/outfit/job/psychiatrist
alt_outfits = list("Psychologist" = /obj/outfit/job/psychiatrist/psycho)
blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER)
/datum/outfit/job/psychiatrist
/obj/outfit/job/psychiatrist
name = "Psychiatrist"
base_name = "Psychiatrist"
jobtype = /datum/job/psychiatrist
@@ -252,7 +252,7 @@
messengerbag = /obj/item/storage/backpack/messenger/psych
messengerbag_faction = /obj/item/storage/backpack/messenger/nt
/datum/outfit/job/psychiatrist/psycho
/obj/outfit/job/psychiatrist/psycho
name = "Psychologist"
jobtype = /datum/job/psychiatrist
@@ -276,11 +276,11 @@
access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PSYCHIATRIST, ACCESS_FIRST_RESPONDER)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_FIRST_RESPONDER)
outfit = /datum/outfit/job/med_tech
outfit = /obj/outfit/job/med_tech
blacklisted_species = list(SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_IPC_G2, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER)
/datum/outfit/job/med_tech
/obj/outfit/job/med_tech
name = "First Responder"
base_name = "First Responder"
jobtype = /datum/job/med_tech
@@ -320,7 +320,7 @@
department_flag = MEDSCI
faction = "Station"
alt_titles = list("First Responder Trainee", "Pharmacy Intern", "Resident Physician", "Resident Surgeon", "Resident Psychiatrist")
alt_outfits = list("First Responder Trainee" = /datum/outfit/job/intern_med/medtech, "Pharmacy Intern" = /datum/outfit/job/intern_med/pharmacist, "Resident Surgeon" = /datum/outfit/job/intern_med/surgeon, "Resident Psychiatrist" = /datum/outfit/job/intern_med/psychiatrist)
alt_outfits = list("First Responder Trainee" = /obj/outfit/job/intern_med/medtech, "Pharmacy Intern" = /obj/outfit/job/intern_med/pharmacist, "Resident Surgeon" = /obj/outfit/job/intern_med/surgeon, "Resident Psychiatrist" = /obj/outfit/job/intern_med/psychiatrist)
alt_ages = list("Pharmacy Intern" = list(
SPECIES_HUMAN = 25,
SPECIES_SKRELL = 58,
@@ -352,10 +352,10 @@
SPECIES_SKRELL = 50,
SPECIES_SKRELL_AXIORI = 50
)
outfit = /datum/outfit/job/intern_med
outfit = /obj/outfit/job/intern_med
blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER)
/datum/outfit/job/intern_med
/obj/outfit/job/intern_med
name = "Medical Intern"
jobtype = /datum/job/intern_med
@@ -379,7 +379,7 @@
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/medical
tablet = /obj/item/modular_computer/handheld/preset/medical
/datum/outfit/job/intern_med/medtech
/obj/outfit/job/intern_med/medtech
name = "First Responder Trainee"
head = /obj/item/clothing/head/softcap/nt
@@ -394,7 +394,7 @@
/obj/item/storage/firstaid = 1
)
/datum/outfit/job/intern_med/pharmacist
/obj/outfit/job/intern_med/pharmacist
name = "Pharmacy Intern"
shoes = /obj/item/clothing/shoes/sneakers/medsci
@@ -404,16 +404,16 @@
dufflebag = /obj/item/storage/backpack/duffel/pharm
messengerbag = /obj/item/storage/backpack/messenger/pharm
/datum/outfit/job/intern_med/surgeon
/obj/outfit/job/intern_med/surgeon
name = "Resident Surgeon"
shoes = /obj/item/clothing/shoes/sneakers/medsci
/datum/outfit/job/intern_med/surgeon/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/intern_med/surgeon/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(!isskrell(H))
H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery(H), slot_head)
/datum/outfit/job/intern_med/psychiatrist
/obj/outfit/job/intern_med/psychiatrist
name = "Resident Psychiatrist"
shoes = /obj/item/clothing/shoes/sneakers/medsci
code/game/jobs/job/outsider/merchant.dm
+5 -5
View File
@@ -26,7 +26,7 @@
latejoin_at_spawnpoints = TRUE
outfit = /datum/outfit/job/merchant
outfit = /obj/outfit/job/merchant
blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER)
/datum/job/merchant/announce(mob/living/carbon/human/H)
@@ -38,7 +38,7 @@
spawn_positions = 1
total_positions = 1
/datum/outfit/job/merchant
/obj/outfit/job/merchant
name = "Merchant"
jobtype = /datum/job/merchant
@@ -51,7 +51,7 @@
tablet = /obj/item/modular_computer/handheld/preset/civilian
r_pocket = /obj/item/device/price_scanner
/datum/outfit/merchant_assistant
/obj/outfit/merchant_assistant
name = "Merchant's Assistant"
id = /obj/item/card/id/merchant
tab_pda = /obj/item/modular_computer/handheld/pda/civilian/merchant
@@ -90,8 +90,8 @@
/obj/item/storage/wallet/random = 1
)
/datum/outfit/merchant_assistant/get_id_rank(mob/living/carbon/human/H)
/obj/outfit/merchant_assistant/get_id_rank(mob/living/carbon/human/H)
return "Merchant's Assistant"
/datum/outfit/merchant_assistant/get_id_access()
/obj/outfit/merchant_assistant/get_id_access()
return list(ACCESS_MERCHANT)
code/game/jobs/job/outsider/representative.dm
+12 -12
View File
@@ -18,12 +18,12 @@
access = list(ACCESS_JOURNALIST, ACCESS_MAINT_TUNNELS)
minimal_access = list(ACCESS_JOURNALIST, ACCESS_MAINT_TUNNELS)
alt_titles = list("Freelance Journalist")
alt_outfits = list("Freelance Journalist" = /datum/outfit/job/journalistf)
alt_outfits = list("Freelance Journalist" = /obj/outfit/job/journalistf)
title_accesses = list("Corporate Reporter" = list(ACCESS_MEDICAL, ACCESS_SEC_DOORS, ACCESS_RESEARCH, ACCESS_ENGINE))
outfit = /datum/outfit/job/journalist
outfit = /obj/outfit/job/journalist
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
/datum/outfit/job/journalist
/obj/outfit/job/journalist
name = "Corporate Reporter"
jobtype = /datum/job/journalist
@@ -49,7 +49,7 @@
/obj/item/device/tvcamera = 1
)
/datum/outfit/job/journalistf
/obj/outfit/job/journalistf
name = "Freelance Journalist"
jobtype = /datum/job/journalist
@@ -90,7 +90,7 @@
"Corporate Representative",
"Corporate Executive"
)
outfit = /datum/outfit/job/representative
outfit = /obj/outfit/job/representative
blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER)
/datum/job/consular/pre_spawn(mob/abstract/new_player/player)
@@ -105,7 +105,7 @@
var/datum/faction/faction = SSjobs.GetFaction(H)
LAZYDISTINCTADD(faction.allowed_role_types, REPRESENTATIVE_ROLE)
/datum/outfit/job/representative
/obj/outfit/job/representative
name = "NanoTrasen Corporate Liaison"
var/fax_department = "Representative's Office"
jobtype = /datum/job/representative
@@ -130,13 +130,13 @@
/obj/item/gun/energy/pistol = 1
)
/datum/outfit/job/representative/post_equip(mob/living/carbon/human/H, visualsOnly)
/obj/outfit/job/representative/post_equip(mob/living/carbon/human/H, visualsOnly)
. = ..()
if(H && !visualsOnly)
addtimer(CALLBACK(src, PROC_REF(send_representative_mission), H), 5 MINUTES)
return TRUE
/datum/outfit/job/representative/proc/send_representative_mission(var/mob/living/carbon/human/H)
/obj/outfit/job/representative/proc/send_representative_mission(var/mob/living/carbon/human/H)
var/faxtext = "<center><br><h2><br><b>Directives Report</h2></b></FONT size><HR></center>"
faxtext += "<b><font face='Courier New'>Attention [name], the following directives are to be fulfilled during your stay in the station:</font></b><br><ul>"
@@ -156,7 +156,7 @@
P.update_icon()
return
/datum/outfit/job/representative/proc/get_objectives(var/mob/living/carbon/human/H, var/mission_level)
/obj/outfit/job/representative/proc/get_objectives(var/mob/living/carbon/human/H, var/mission_level)
var/rep_objectives
for (var/datum/faction/faction in SSjobs.factions)
@@ -193,7 +193,7 @@
access = list(ACCESS_CONSULAR, ACCESS_MAINT_TUNNELS)
minimal_access = list(ACCESS_CONSULAR)
outfit = /datum/outfit/job/representative/consular
outfit = /obj/outfit/job/representative/consular
blacklisted_species = list(SPECIES_VAURCA_BULWARK)
blacklisted_citizenship = list(CITIZENSHIP_SOL, CITIZENSHIP_ERIDANI, CITIZENSHIP_ELYRA_NCP, CITIZENSHIP_NONE, CITIZENSHIP_FREE_COUNCIL)
@@ -202,7 +202,7 @@
if(citizenship)
return citizenship.consular_outfit
/datum/outfit/job/representative/consular
/obj/outfit/job/representative/consular
name = "Consular Officer"
fax_department = "Consular's Office"
jobtype = /datum/job/consular
@@ -216,7 +216,7 @@
)
implants = null
/datum/outfit/job/representative/consular/get_objectives(var/mob/living/carbon/human/H, var/mission_level)
/obj/outfit/job/representative/consular/get_objectives(var/mob/living/carbon/human/H, var/mission_level)
var/rep_objectives
var/datum/citizenship/citizenship = SSrecords.citizenships[H.citizenship]
if(citizenship)
code/game/jobs/job/science.dm
+12 -12
View File
@@ -35,11 +35,11 @@
SPECIES_SKRELL = 100,
SPECIES_SKRELL_AXIORI = 100
)
outfit = /datum/outfit/job/rd
outfit = /obj/outfit/job/rd
blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK)
/datum/outfit/job/rd
/obj/outfit/job/rd
name = "Research Director"
jobtype = /datum/job/rd
@@ -85,10 +85,10 @@
minimal_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_INTREPID)
minimal_player_age = 14
outfit = /datum/outfit/job/scientist
outfit = /obj/outfit/job/scientist
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
/datum/outfit/job/scientist
/obj/outfit/job/scientist
name = "Scientist"
jobtype = /datum/job/scientist
@@ -137,10 +137,10 @@
minimal_access = list(ACCESS_RESEARCH, ACCESS_XENOARCH, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_INTREPID)
minimal_player_age = 14
outfit = /datum/outfit/job/scientist/xenoarchaeologist
outfit = /obj/outfit/job/scientist/xenoarchaeologist
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
/datum/outfit/job/scientist/xenoarchaeologist
/obj/outfit/job/scientist/xenoarchaeologist
name = "Xenoarchaeologist"
jobtype = /datum/job/xenoarchaeologist
@@ -174,10 +174,10 @@
minimal_player_age = 14
outfit = /datum/outfit/job/scientist/xenobiologist
outfit = /obj/outfit/job/scientist/xenobiologist
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
/datum/outfit/job/scientist/xenobiologist
/obj/outfit/job/scientist/xenobiologist
name = "Xenobiologist"
jobtype = /datum/job/xenobiologist
@@ -206,11 +206,11 @@
minimal_player_age = 14
outfit = /datum/outfit/job/scientist/xenobotanist
outfit = /obj/outfit/job/scientist/xenobotanist
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
/datum/outfit/job/scientist/xenobotanist
/obj/outfit/job/scientist/xenobotanist
name = "Xenobotanist"
jobtype = /datum/job/xenobotanist
@@ -228,10 +228,10 @@
selection_color = "#a44799"
access = list(ACCESS_RESEARCH, ACCESS_TOX)
minimal_access = list(ACCESS_RESEARCH, ACCESS_TOX)
outfit = /datum/outfit/job/intern_sci
outfit = /obj/outfit/job/intern_sci
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
/datum/outfit/job/intern_sci
/obj/outfit/job/intern_sci
name = "Lab Assistant"
jobtype = /datum/job/intern_sci
code/game/jobs/job/security.dm
+20 -20
View File
@@ -30,11 +30,11 @@
ACCESS_WEAPONS, ACCESS_INTREPID, ACCESS_TELEPORTER)
minimal_player_age = 14
outfit = /datum/outfit/job/hos
outfit = /obj/outfit/job/hos
blacklisted_species = list(SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA_ZHAN, SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER)
/datum/outfit/job/hos
/obj/outfit/job/hos
name = "Head of Security"
jobtype = /datum/job/hos
@@ -62,7 +62,7 @@
dufflebag = /obj/item/storage/backpack/duffel/hos
messengerbag = /obj/item/storage/backpack/messenger/hos
/datum/outfit/job/hos/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/hos/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(istajara(H))
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots/toeless(H), slot_shoes)
@@ -95,11 +95,11 @@
access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_WEAPONS)
minimal_access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_WEAPONS)
minimal_player_age = 7
outfit = /datum/outfit/job/warden
outfit = /obj/outfit/job/warden
blacklisted_species = list(SPECIES_IPC_ZENGHU, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_XION_REMOTE, SPECIES_VAURCA_BULWARK, SPECIES_DIONA_COEUS, SPECIES_VAURCA_BREEDER)
/datum/outfit/job/warden
/obj/outfit/job/warden
name = "Warden"
jobtype = /datum/job/warden
@@ -122,7 +122,7 @@
dufflebag = /obj/item/storage/backpack/duffel/sec
messengerbag = /obj/item/storage/backpack/messenger/sec
/datum/outfit/job/warden/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/warden/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(istajara(H))
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots/toeless(H), slot_shoes)
@@ -155,10 +155,10 @@
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS)
minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_WEAPONS)
minimal_player_age = 3
outfit = /datum/outfit/job/forensics
outfit = /obj/outfit/job/forensics
blacklisted_species = list(SPECIES_IPC_ZENGHU, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_XION_REMOTE, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER)
/datum/outfit/job/forensics
/obj/outfit/job/forensics
name = "Investigator"
jobtype = /datum/job/investigator
@@ -183,7 +183,7 @@
/obj/item/storage/box/evidence = 1
)
/datum/outfit/job/forensics/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/forensics/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
H.equip_or_collect(new /obj/item/clothing/gloves/black/forensic(H), slot_gloves)
@@ -208,11 +208,11 @@
access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_WEAPONS)
minimal_access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_WEAPONS)
minimal_player_age = 7
outfit = /datum/outfit/job/officer
outfit = /obj/outfit/job/officer
blacklisted_species = list(SPECIES_IPC_ZENGHU, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_XION_REMOTE, SPECIES_VAURCA_BULWARK, SPECIES_DIONA_COEUS, SPECIES_VAURCA_BREEDER)
/datum/outfit/job/officer
/obj/outfit/job/officer
name = "Security Officer"
jobtype = /datum/job/officer
@@ -233,7 +233,7 @@
dufflebag = /obj/item/storage/backpack/duffel/sec
messengerbag = /obj/item/storage/backpack/messenger/sec
/datum/outfit/job/officer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/officer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(istajara(H))
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots/toeless(H), slot_shoes)
@@ -252,7 +252,7 @@
department_flag = ENGSEC
faction = "Station"
alt_titles = list("Investigator Intern", "Warden Cadet")
alt_outfits = list("Investigator Intern" = /datum/outfit/job/intern_sec/forensics)
alt_outfits = list("Investigator Intern" = /obj/outfit/job/intern_sec/forensics)
alt_ages = list("Investigator Intern" = list(
SPECIES_HUMAN = 24,
SPECIES_SKRELL = 58,
@@ -269,7 +269,7 @@
selection_color = "#991818"
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS)
minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS)
outfit = /datum/outfit/job/intern_sec/officer
outfit = /obj/outfit/job/intern_sec/officer
minimum_character_age = list(
SPECIES_HUMAN = 18,
SPECIES_SKRELL = 50,
@@ -278,7 +278,7 @@
blacklisted_species = list(SPECIES_IPC_ZENGHU, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_XION_REMOTE, SPECIES_VAURCA_BULWARK, SPECIES_DIONA_COEUS, SPECIES_VAURCA_BREEDER)
/datum/outfit/job/intern_sec
/obj/outfit/job/intern_sec
name = "Security Cadet"
jobtype = /datum/job/intern_sec
@@ -300,16 +300,16 @@
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/security
tablet = /obj/item/modular_computer/handheld/preset/security
/datum/outfit/job/intern_sec/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/intern_sec/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
/datum/outfit/job/intern_sec/officer
/obj/outfit/job/intern_sec/officer
name = "Security Cadet"
jobtype = /datum/job/intern_sec
shoes = null
/datum/outfit/job/intern_sec/officer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/intern_sec/officer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(istajara(H))
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots/toeless(H), slot_shoes)
@@ -321,13 +321,13 @@
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black_leather(H), slot_gloves)
/datum/outfit/job/intern_sec/forensics
/obj/outfit/job/intern_sec/forensics
name = "Investigator Intern"
jobtype = /datum/job/intern_sec
shoes = /obj/item/clothing/shoes/laceup
/datum/outfit/job/intern_sec/forensics/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/intern_sec/forensics/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
H.equip_or_collect(new /obj/item/clothing/gloves/black/forensic(H), slot_gloves)
code/game/jobs/job/ship_crew.dm
+6 -6
View File
@@ -12,7 +12,7 @@
economic_modifier = 1
access = list() //See /datum/job/assistant/get_access()
minimal_access = list() //See /datum/job/assistant/get_access()
outfit = /datum/outfit/job/assistant
outfit = /obj/outfit/job/assistant
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
/datum/job/assistant/get_access(selected_title)
@@ -21,7 +21,7 @@
else
return list()
/datum/outfit/job/assistant
/obj/outfit/job/assistant
name = "Assistant"
jobtype = /datum/job/assistant
@@ -41,17 +41,17 @@
economic_modifier = 1
access = list()
minimal_access = list()
outfit = /datum/outfit/job/visitor
outfit = /obj/outfit/job/visitor
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
/datum/outfit/job/visitor
/obj/outfit/job/visitor
name = "Off-Duty Crew Member"
jobtype = /datum/job/visitor
uniform = /obj/item/clothing/under/color/black
shoes = /obj/item/clothing/shoes/sneakers/black
/datum/outfit/job/visitor/passenger
/obj/outfit/job/visitor/passenger
name = "Passenger"
jobtype = /datum/job/passenger
@@ -68,6 +68,6 @@
economic_modifier = 1
access = list()
minimal_access = list()
outfit = /datum/outfit/job/visitor/passenger
outfit = /obj/outfit/job/visitor/passenger
blacklisted_species = null
blacklisted_species = list(SPECIES_VAURCA_BREEDER)
code/modules/admin/verbs/debug.dm
+25 -25
View File
@@ -324,30 +324,30 @@
if("Cancel")
return
if("ERT")
outfit_catagories["SCC-ERT"] = typesof(/datum/outfit/admin/ert/scc)
outfit_catagories["NT-ERT"] = typesof(/datum/outfit/admin/ert/nanotrasen)
outfit_catagories["Deathsquad"] = typesof(/datum/outfit/admin/deathsquad)
outfit_catagories["TCFL"] = typesof(/datum/outfit/admin/ert/legion)
outfit_catagories["Syndicate"] = typesof(/datum/outfit/admin/deathsquad/syndicate)
outfit_catagories["Freelance Mercenaries"] = typesof(/datum/outfit/admin/ert/mercenary)
outfit_catagories["Free Solarian Fleets Marines"] = typesof(/datum/outfit/admin/ert/fsf)
outfit_catagories["Kataphracts"] = typesof(/datum/outfit/admin/ert/kataphract)
outfit_catagories["Eridani"] = typesof(/datum/outfit/admin/ert/ap_eridani)
outfit_catagories["IAC"] = typesof(/datum/outfit/admin/ert/iac)
outfit_catagories["Kosmostrelki"] = typesof(/datum/outfit/admin/ert/pra_cosmonaut)
outfit_catagories["Elyran Navy"] = typesof(/datum/outfit/admin/ert/elyran_trooper)
outfit_catagories["SCC-ERT"] = typesof(/obj/outfit/admin/ert/scc)
outfit_catagories["NT-ERT"] = typesof(/obj/outfit/admin/ert/nanotrasen)
outfit_catagories["Deathsquad"] = typesof(/obj/outfit/admin/deathsquad)
outfit_catagories["TCFL"] = typesof(/obj/outfit/admin/ert/legion)
outfit_catagories["Syndicate"] = typesof(/obj/outfit/admin/deathsquad/syndicate)
outfit_catagories["Freelance Mercenaries"] = typesof(/obj/outfit/admin/ert/mercenary)
outfit_catagories["Free Solarian Fleets Marines"] = typesof(/obj/outfit/admin/ert/fsf)
outfit_catagories["Kataphracts"] = typesof(/obj/outfit/admin/ert/kataphract)
outfit_catagories["Eridani"] = typesof(/obj/outfit/admin/ert/ap_eridani)
outfit_catagories["IAC"] = typesof(/obj/outfit/admin/ert/iac)
outfit_catagories["Kosmostrelki"] = typesof(/obj/outfit/admin/ert/pra_cosmonaut)
outfit_catagories["Elyran Navy"] = typesof(/obj/outfit/admin/ert/elyran_trooper)
if("Admin")
outfit_catagories["Stellar Corporate Conglomerate"] = typesof(/datum/outfit/admin/scc)
outfit_catagories["NanoTrasen"] = typesof(/datum/outfit/admin/nt)
outfit_catagories["Antagonist"] = typesof(/datum/outfit/admin/syndicate)
outfit_catagories["Event"] = typesof(/datum/outfit/admin/event)
outfit_catagories["TCFL"] = typesof(/datum/outfit/admin/tcfl)
outfit_catagories["Killers"] = typesof(/datum/outfit/admin/killer)
outfit_catagories["Job"] = subtypesof(/datum/outfit/job)
outfit_catagories["Megacorps"] = subtypesof(/datum/outfit/admin/megacorp)
outfit_catagories["Pod Survivors"] = subtypesof(/datum/outfit/admin/pod)
outfit_catagories["Miscellaneous"] = typesof(/datum/outfit/admin/random)
outfit_catagories["Miscellaneous"] += /datum/outfit/admin/random_employee
outfit_catagories["Stellar Corporate Conglomerate"] = typesof(/obj/outfit/admin/scc)
outfit_catagories["NanoTrasen"] = typesof(/obj/outfit/admin/nt)
outfit_catagories["Antagonist"] = typesof(/obj/outfit/admin/syndicate)
outfit_catagories["Event"] = typesof(/obj/outfit/admin/event)
outfit_catagories["TCFL"] = typesof(/obj/outfit/admin/tcfl)
outfit_catagories["Killers"] = typesof(/obj/outfit/admin/killer)
outfit_catagories["Job"] = subtypesof(/obj/outfit/job)
outfit_catagories["Megacorps"] = subtypesof(/obj/outfit/admin/megacorp)
outfit_catagories["Pod Survivors"] = subtypesof(/obj/outfit/admin/pod)
outfit_catagories["Miscellaneous"] = typesof(/obj/outfit/admin/random)
outfit_catagories["Miscellaneous"] += /obj/outfit/admin/random_employee
var/chosen_catagory = input("Select an outfit catagory.", "Robust Quick-dress Shop") as null|anything in outfit_catagories
if(isnull(chosen_catagory))
@@ -355,7 +355,7 @@
var/list/outfit_types = list()
for(var/outfit in outfit_catagories[chosen_catagory])
var/datum/outfit/admin/A = new outfit
var/obj/outfit/admin/A = new outfit
outfit_types[A.name] = A
var/chosen_outfit = input("Select an outfit.", "Robust Quick-dress Shop") as null|anything in outfit_types
@@ -364,7 +364,7 @@
feedback_add_details("admin_verb","SEQ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc
var/datum/outfit/O = outfit_types[chosen_outfit]
var/obj/outfit/O = outfit_types[chosen_outfit]
if(O)
for(var/obj/item/I in M)
if(istype(I, /obj/item/implant))
code/modules/background/citizenship/citizenship.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/citizenship
var/name
var/description
var/datum/outfit/consular_outfit = /datum/outfit/job/representative/consular
var/obj/outfit/consular_outfit = /obj/outfit/job/representative/consular
var/demonym
var/list/job_species_blacklist = list()
code/modules/background/citizenship/human.dm
+11 -11
View File
@@ -4,7 +4,7 @@
It is one of the most populated systems in human space, a financial center, industrial powerhouse and one of the most prestigious systems in the galaxy. It is also very known for \
its large xeno population which enjoys various privileges compared to other space powers. With a very lax migration policy, virtually everyone is welcome to live here. However, \
unrest and gridlock undermine the government, and the aggressive attitude of the Sol Alliance against its former system has made many worried for the future of the Republic."
consular_outfit = /datum/outfit/job/representative/consular/ceti
consular_outfit = /obj/outfit/job/representative/consular/ceti
job_species_blacklist = list(
"Consular Officer" = list(
@@ -47,7 +47,7 @@
return rep_objectives
/datum/outfit/job/representative/consular/ceti
/obj/outfit/job/representative/consular/ceti
name = "Tau Ceti Consular Officer"
uniform = /obj/item/clothing/under/suit_jacket/navy
@@ -59,7 +59,7 @@
/obj/item/stamp/biesel = 1,
)
/datum/outfit/job/representative/consular/ceti/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/representative/consular/ceti/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H)
if(isvaurca(H))
H.equip_to_slot_or_del(new /obj/item/clothing/under/gearharness(H), slot_w_uniform)
@@ -82,7 +82,7 @@
However, it still controls the largest human military in the entire spur, and their cooperation with Einstein Engines and the Nralakk Federation has contributed to it gradually regaining some of its pre-collapse influence and power. \
Presently ruled by a military junta that is gradually giving way to civilian control, the Alliance is also generally xenophobic, and most non-humans find themselves discriminated against in Solarian territory. \
Though much of its former possessions are now occupied by warlord statelets and other interstellar powers, the Alliance still maintains a revanchist outlook, refusing to relinquish its claims to its lost territories."
consular_outfit = /datum/outfit/job/representative/consular/sol
consular_outfit = /obj/outfit/job/representative/consular/sol
job_species_blacklist = list(
"Consular Officer" = list(
@@ -128,7 +128,7 @@
return rep_objectives
/datum/outfit/job/representative/consular/sol
/obj/outfit/job/representative/consular/sol
name = "Sol Consular Officer"
accessory = /obj/item/clothing/accessory/sol_pin
@@ -156,7 +156,7 @@
from whole colonial systems to travelling super ships to mining and farming outposts. Most communities here are, although not as developed as many galactic powers, very \
tightly-knit. Almost anything and anyone can be found in these wild, mostly uncharted lands. "
demonym = "frontiersman"
consular_outfit = /datum/outfit/job/representative/consular/coalition
consular_outfit = /obj/outfit/job/representative/consular/coalition
job_species_blacklist = list(
"Consular Officer" = list(
@@ -171,7 +171,7 @@
)
)
/datum/outfit/job/representative/consular/coalition
/obj/outfit/job/representative/consular/coalition
name = "Coalition Consular Officer"
backpack_contents = list(
@@ -186,9 +186,9 @@
is \"For Greatness We Strive\". It's official language is Tau Ceti Basic, though several old-earth languages cling to life in small enclaves, such as arabic, persian, and farsi. \
The Republic has mixed relations with NanoTrasen, due to their own possession of phoron."
demonym = "elyran"
consular_outfit = /datum/outfit/job/representative/consular/elyra
consular_outfit = /obj/outfit/job/representative/consular/elyra
/datum/outfit/job/representative/consular/elyra
/obj/outfit/job/representative/consular/elyra
name = "Elyra Consular Officer"
backpack_contents = list(
@@ -238,7 +238,7 @@
His Imperial Majesty Boleslaw Keeser. The Empire of Dominia was proclaimed in 2385 by then-Emperor Godwin Keeser, unifying a colony which had been isolated for hundreds of years. \
Imperial society is dominated by the Great and Minor Houses under the Emperor and is very socio-economically stratified due to the so-called blood debt, known as the Mor'iz'al."
consular_outfit = /datum/outfit/job/representative/consular/dominia
consular_outfit = /obj/outfit/job/representative/consular/dominia
job_species_blacklist = list(
"Consular Officer" = list(
@@ -279,7 +279,7 @@
return rep_objectives
/datum/outfit/job/representative/consular/dominia
/obj/outfit/job/representative/consular/dominia
name = "Empire of Dominia Consular Officer"
backpack_contents = list(
code/modules/background/citizenship/ipc.dm
+2 -2
View File
@@ -10,7 +10,7 @@
Golden Deep who find themselves in human space are known as 'affiliates', and find themselves ostracized and cut off from the \
Frontier collective. Due to their peerless skill in business and clerical duties, affiliates share warm relations with NanoTrasen and \
find themselves the target of job opportunities in exchange for citizenship."
consular_outfit = /datum/outfit/job/representative/consular/golden
consular_outfit = /obj/outfit/job/representative/consular/golden
job_species_blacklist = list(
"Consular Officer" = list(
@@ -31,7 +31,7 @@
)
)
/datum/outfit/job/representative/consular/golden
/obj/outfit/job/representative/consular/golden
name = "Golden Deep Consular Officer"
uniform = /obj/item/clothing/under/goldendeep/suit
code/modules/background/citizenship/skrell.dm
+3 -3
View File
@@ -6,7 +6,7 @@
life almost unmatched anywhere else in the Spur. \
A rogue artificial intelligence, Glorsh-Omega, has traumatized this nation for centuries to come. The Federation is very wary of humanity, who has acquired AI technology \
after a Federation tech leak provided them with the research required to create their own AI, as well as allowing them to create IPCs."
consular_outfit = /datum/outfit/job/representative/consular/nralakk
consular_outfit = /obj/outfit/job/representative/consular/nralakk
job_species_blacklist = list(
"Consular Officer" = list(
@@ -67,7 +67,7 @@
return rep_objectives
/datum/outfit/job/representative/consular/nralakk
/obj/outfit/job/representative/consular/nralakk
name = "Nralakk Consular Officer"
uniform = /obj/item/clothing/under/skrell
@@ -75,7 +75,7 @@
/obj/item/device/camera = 1
)
/datum/outfit/job/representative/consular/nralakk/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/representative/consular/nralakk/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H)
if(isskrell(H))
H.equip_to_slot_or_del(new /obj/item/gun/energy/fedpistol(H), slot_belt)
code/modules/background/citizenship/tajara.dm
+6 -6
View File
@@ -5,7 +5,7 @@
putting the State at the top of a hierarchy of power. The PRA is a very centralized state, but in recent years has slowly been able to start making true its promises to bring \
revolution to the masses. With land reform, enfranchisement of women and peasantry, literacy initiatives, and the collectivization of farms and the means of production, the PRA is \
struggling to hold true to its radical ideals while an entrenched upper party stubbornly tries to hold onto power."
consular_outfit = /datum/outfit/job/representative/consular/pra
consular_outfit = /obj/outfit/job/representative/consular/pra
job_species_blacklist = list(
"Consular Officer" = list(
@@ -38,7 +38,7 @@
if(REPRESENTATIVE_MISSION_LOW)
return "Ensure the loyalty of PRA Citizen to the Party and President Hadii. You must also promote the relationship between the [SSatlas.current_map.boss_name] and the People's Republic through diplomacy."
/datum/outfit/job/representative/consular/pra
/obj/outfit/job/representative/consular/pra
name = "PRA Consular Officer"
glasses = null
@@ -61,7 +61,7 @@
nation they were fighting for the Democratic People's Republic of Adhomai. The DPRA is now lead by Purrjar Almrah Harrlala who is struggling to transition what was once a militant \
insurgency movement, then an organized military, into a modern, democratic nation. With the help of Nated as a government minister going out to negotiate with ruling Juntas to \
voluntarily turn over power to civilian governments, the DPRA's future faces many fundamental changes."
consular_outfit = /datum/outfit/job/representative/consular/dpra
consular_outfit = /obj/outfit/job/representative/consular/dpra
job_species_blacklist = list(
"Consular Officer" = list(
@@ -94,7 +94,7 @@
if(REPRESENTATIVE_MISSION_LOW)
return "Ensure that DPRA citizens are following the principles of Al'mariism. Defend the rights of the Tajara through diplomacy."
/datum/outfit/job/representative/consular/dpra
/obj/outfit/job/representative/consular/dpra
name = "DPRA Consular Officer"
glasses = null
@@ -118,7 +118,7 @@
this dynasty should rule as a constitutional monarchy in order to prevent abuses of power. In reality, this has proven very difficult, especially with the realities of war. \
The lofty titles of the nobles disguise the fact that most of the nobility of this new kingdom remain in squalor only marginally better than the peasants. Life is difficult, and \
the Azunja dynasty finds itself struggling to function with their limited constitutional powers and factional in-fighting between the military and the civilian government."
consular_outfit = /datum/outfit/job/representative/consular/nka
consular_outfit = /obj/outfit/job/representative/consular/nka
job_species_blacklist = list(
"Consular Officer" = list(
@@ -151,7 +151,7 @@
if(REPRESENTATIVE_MISSION_LOW)
return "Ensure that NKA citizens are loyal to the Crown. You must also promote the relationship between the [SSatlas.current_map.boss_name] and the New Kingdom through diplomacy."
/datum/outfit/job/representative/consular/nka
/obj/outfit/job/representative/consular/nka
name = "NKA Consular Officer"
glasses = null
code/modules/background/citizenship/unathi.dm
+3 -3
View File
@@ -4,7 +4,7 @@
Under Overlords land on planets are divided between Lords, with the rest of the feudal hierarchy being beneath them. The Clan system is deeply entrenched in Unathi society, \
with everything else revolving around it. It forms a major part of their code of honor, which stresses the importance of martial abilities and loyalty to the Clan. Despite an \
apocalyptic world war that nearly plunged the species into ruin, the Izweski Hegemony has rebounded and is currently working on making the Hegemony a galactic power."
consular_outfit = /datum/outfit/job/representative/consular/izweski
consular_outfit = /obj/outfit/job/representative/consular/izweski
job_species_blacklist = list(
"Consular Officer" = list(
@@ -64,14 +64,14 @@
return rep_objectives
/datum/outfit/job/representative/consular/izweski
/obj/outfit/job/representative/consular/izweski
name = "Izweski Hegemony Consular Officer"
uniform = /obj/item/clothing/under/unathi
backpack_contents = list(/obj/item/device/camera = 1)
belt = /obj/item/gun/energy/pistol/hegemony
/datum/outfit/job/representative/consular/izweski/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/representative/consular/izweski/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H)
if(isvaurca(H))
H.equip_to_slot_or_del(new /obj/item/clothing/under/gearharness(H), slot_w_uniform)
code/modules/background/citizenship/vaurca.dm
+9 -9
View File
@@ -5,7 +5,7 @@
be the Alpha of the Vaurca and the face of their species. They make up the majority of the Vaurca present in Tau Ceti and human space.Zo'ra have cold relations with other Hives. In \
Tau Ceti, this has lead to confrontations between them and other Hives arriving in the system. The Zo'ra are the most politically developed Hive, recently helping in the funding of \
the Tau Ceti Foreign Legion, and making active progress to spread their influence."
consular_outfit = /datum/outfit/job/representative/consular/zora
consular_outfit = /obj/outfit/job/representative/consular/zora
job_species_blacklist = list(
"Consular Officer" = list(
@@ -51,7 +51,7 @@
return rep_objectives
/datum/outfit/job/representative/consular/zora
/obj/outfit/job/representative/consular/zora
name = "Zo'ra Consular Officer"
uniform = /obj/item/clothing/under/gearharness
@@ -62,7 +62,7 @@
mask = /obj/item/clothing/mask/gas/vaurca/filter
suit = /obj/item/clothing/suit/vaurca/breeder
/datum/outfit/job/representative/consular/zora/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/representative/consular/zora/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H)
if(isvaurca(H))
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec(H), slot_back)
@@ -79,7 +79,7 @@
Now parting their own ways, both Hives have developed differently. the K'lax became the newest vassal of the Izweski Nation, and have largely settled in Tret. \
They maintain subtly warm, if terse relations with the Hegemony as a whole, and have committed to its terraforming agenda, being instrumental in the implementation of such a monumental undertaking. \
The K'lax are the most technologically developed Hive, and are leading the way in reconstructing the species' superior technology."
consular_outfit = /datum/outfit/job/representative/consular/klax
consular_outfit = /obj/outfit/job/representative/consular/klax
job_species_blacklist = list(
"Consular Officer" = list(
@@ -122,7 +122,7 @@
return rep_objectives
/datum/outfit/job/representative/consular/klax
/obj/outfit/job/representative/consular/klax
name = "K'lax Consular Officer"
uniform = /obj/item/clothing/under/gearharness
@@ -133,7 +133,7 @@
mask = /obj/item/clothing/mask/gas/vaurca/filter
suit = /obj/item/clothing/suit/vaurca/breeder/klax
/datum/outfit/job/representative/consular/klax/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/representative/consular/klax/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H)
if(isvaurca(H))
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec/klax(H), slot_back)
@@ -149,7 +149,7 @@
Unlike all other Hives, the C'thur are led by their original Hive Queen, who, with a council of three other Lesser Queens, leads the Hive in this new age. \
In this effort, the Hive has begun dealing with the multitude of governments and corporations of the galaxy, all under the auspices of their Skrellian saviors. \
The C'thur are the most economically developed Hive, having stakes in Einstein Engines and Zeng-Hu Pharmaceuticals."
consular_outfit = /datum/outfit/job/representative/consular/cthur
consular_outfit = /obj/outfit/job/representative/consular/cthur
job_species_blacklist = list(
"Consular Officer" = list(
@@ -193,7 +193,7 @@
return rep_objectives
/datum/outfit/job/representative/consular/cthur
/obj/outfit/job/representative/consular/cthur
name = "C'thur Consular Officer"
uniform = /obj/item/clothing/under/gearharness
@@ -204,7 +204,7 @@
mask = /obj/item/clothing/mask/gas/vaurca/filter
suit = /obj/item/clothing/suit/vaurca/breeder/cthur
/datum/outfit/job/representative/consular/cthur/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/job/representative/consular/cthur/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H)
if(isvaurca(H))
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec/cthur(H), slot_back)
code/modules/ghostroles/spawner/human/admin/admin.dm
+7 -7
View File
@@ -18,7 +18,7 @@
max_count = 4
//Vars related to human mobs
outfit = /datum/outfit/admin/nt/odinsec
outfit = /obj/outfit/admin/nt/odinsec
possible_species = list(SPECIES_HUMAN,SPECIES_SKRELL, SPECIES_SKRELL_AXIORI,SPECIES_IPC)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -42,7 +42,7 @@
max_count = 4
//Vars related to human mobs
outfit = /datum/outfit/admin/nt/odindoc
outfit = /obj/outfit/admin/nt/odindoc
possible_species = list(SPECIES_HUMAN,SPECIES_SKRELL, SPECIES_SKRELL_AXIORI,SPECIES_TAJARA,SPECIES_UNATHI,SPECIES_IPC)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -63,7 +63,7 @@
req_perms_edit = R_CCIAA
max_count = 1
outfit = /datum/outfit/admin/nt/odinpharm
outfit = /obj/outfit/admin/nt/odinpharm
possible_species = list(SPECIES_HUMAN,SPECIES_SKRELL, SPECIES_SKRELL_AXIORI,SPECIES_TAJARA,SPECIES_UNATHI,SPECIES_IPC)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -84,7 +84,7 @@
req_perms_edit = R_CCIAA
max_count = 2
outfit = /datum/outfit/admin/nt/odinchef
outfit = /obj/outfit/admin/nt/odinchef
possible_species = list(SPECIES_HUMAN,SPECIES_SKRELL, SPECIES_SKRELL_AXIORI,SPECIES_TAJARA,SPECIES_UNATHI,SPECIES_IPC)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -105,7 +105,7 @@
req_perms_edit = R_CCIAA
max_count = 1
outfit = /datum/outfit/admin/nt/odinbartender
outfit = /obj/outfit/admin/nt/odinbartender
possible_species = list(SPECIES_HUMAN,SPECIES_SKRELL, SPECIES_SKRELL_AXIORI,SPECIES_TAJARA,SPECIES_UNATHI,SPECIES_IPC)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -125,7 +125,7 @@
req_perms = null
max_count = 1
outfit = /datum/outfit/admin/nt/odinjanitor
outfit = /obj/outfit/admin/nt/odinjanitor
possible_species = list(SPECIES_HUMAN,SPECIES_SKRELL, SPECIES_SKRELL_AXIORI,SPECIES_TAJARA,SPECIES_UNATHI,SPECIES_IPC)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -148,7 +148,7 @@
req_perms_edit = R_CCIAA
max_count = 4
outfit = /datum/outfit/admin/ert/legion/sentinel
outfit = /obj/outfit/admin/ert/legion/sentinel
possible_species = list(SPECIES_HUMAN, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_DIONA)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
code/modules/ghostroles/spawner/human/admin/ccia.dm
+8 -8
View File
@@ -21,7 +21,7 @@
short_name = "cciaagent"
name = "CCIA Agent"
outfit = /datum/outfit/admin/nt/cciaa
outfit = /obj/outfit/admin/nt/cciaa
assigned_role = "CCIA Agent"
special_role = "CCIA Agent"
@@ -44,7 +44,7 @@
max_count = 1
//Vars related to human mobs
outfit = /datum/outfit/admin/nt/protection_detail
outfit = /obj/outfit/admin/nt/protection_detail
assigned_role = "Civil Protection Officer"
special_role = "Civil Protection Officer"
@@ -56,7 +56,7 @@
short_name = "sccagent"
name = "SCC Agent"
outfit = /datum/outfit/admin/scc
outfit = /obj/outfit/admin/scc
assigned_role = "SCC Agent"
special_role = "SCC Agent"
@@ -72,7 +72,7 @@
landmark_name = "CCIAEscort"
outfit = /datum/outfit/admin/scc/bodyguard
outfit = /obj/outfit/admin/scc/bodyguard
enabled = FALSE
req_perms = null
@@ -90,7 +90,7 @@
name = "BSSB Agent"
desc = "Investigate issues related to crimes under the jurisdiction of the Biesel Security Services Bureau."
outfit = /datum/outfit/admin/nt/bssb
outfit = /obj/outfit/admin/nt/bssb
assigned_role = "BSSB Agent"
special_role = "BSSB Agent"
@@ -105,7 +105,7 @@
landmark_name = "CCIAEscort"
outfit = /datum/outfit/admin/nt/bssb/guard
outfit = /obj/outfit/admin/nt/bssb/guard
possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
enabled = FALSE
@@ -134,7 +134,7 @@
req_perms = R_CCIAA
//Vars related to human mobs
outfit = /datum/outfit/admin/nt/ert_commander
outfit = /obj/outfit/admin/nt/ert_commander
possible_species = list(SPECIES_HUMAN)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -155,7 +155,7 @@
req_perms = R_CCIAA
//Vars related to human mobs
outfit = /datum/outfit/admin/tcfl
outfit = /obj/outfit/admin/tcfl
possible_species = list(SPECIES_HUMAN,SPECIES_TAJARA_MSAI,SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI,SPECIES_IPC)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
code/modules/ghostroles/spawner/human/emergencypod.dm
+50 -50
View File
@@ -9,7 +9,7 @@
max_count = 1
//Vars related to human mobs
outfit = /datum/outfit/admin/random/visitor
outfit = /obj/outfit/admin/random/visitor
possible_species = list(SPECIES_HUMAN,SPECIES_HUMAN_OFFWORLD,SPECIES_SKRELL, SPECIES_SKRELL_AXIORI,SPECIES_TAJARA,SPECIES_TAJARA_MSAI,SPECIES_TAJARA_ZHAN,SPECIES_UNATHI,SPECIES_VAURCA_WARRIOR,SPECIES_VAURCA_WORKER)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -24,47 +24,47 @@
var/t = pick(list("star", "priest", "rep", "smuggler", "hunter", "occultist", "pmc", "tcfl", "fsf", "scc", "fib"))
if(t == "star")
welcome_message = "You are a stranded star!<br>You were relaxing comfortably in your cryo pod as tragedy struck - the pilot of your luxury yacht fell asleep under some mysterious circumstances. You were unceremoniously stuffed into an escape pod, and left to wander in space. What a despicable, low-quality plot to get rid of you. Should've chosen murder instead - you certainly know you'll convince someone nice to lend you a shuttle."
outfit = /datum/outfit/admin/pod/star
outfit = /obj/outfit/admin/pod/star
possible_species = list(SPECIES_HUMAN,SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
else if(t == "priest")
welcome_message = "You are a stranded Trinary Perfection priest!<br>You were traveling around space on your small shuttle, preaching peacefully of the future divinity of the synthetics, and the grand purpose of mankind as the ones to help them achieve that goal. Unfortunately, Dominians don't seem to be as peaceful in disagreeing with your views - and had to evacuate your shot-down ship. Have your prayers to the Divines helped you now?"
outfit = /datum/outfit/admin/pod/priest
outfit = /obj/outfit/admin/pod/priest
possible_species = list(SPECIES_HUMAN)
else if(t == "rep")
welcome_message = "You are a stranded Idris Incorporated representative!<br>You were traveling back from your business in Sol to the Mendell City HQ. Unfortunately, after a very unusual set of circumstances, the engine broke down just almost as you got back. You're stranded somewhere nearby - perhaps your excellent customer service and negotiation skills might get you a ride back to Mendell?"
outfit = /datum/outfit/admin/pod/rep
outfit = /obj/outfit/admin/pod/rep
possible_species = list(SPECIES_HUMAN)
else if(t == "hunter")
welcome_message = "You are a stranded space fauna hunter!<br>Your ship has been attacked by a wild megacarp - a rare, almost mythical animal... with very expensive trophies. In this encounter, you lost. But the hunt lives on! You just need to find a new spacefaring vessel!"
outfit = /datum/outfit/admin/pod/hunter
outfit = /obj/outfit/admin/pod/hunter
possible_species = list(SPECIES_HUMAN) // no ayyliums because the frontier rig only fits humans. i wish i could put unathi in here tho
else if(t == "occultist")
welcome_message = "You are a stranded occultist!<br>This unfortunate turn of events was in the cards. Nonetheless, you managed to save your most prized possessions - your magical deck of cards and your ominous, definitely magical robes. The cards have also told you that your bad luck will surely be followed by good fortune."
outfit = /datum/outfit/admin/pod/occultist
outfit = /obj/outfit/admin/pod/occultist
else if(t == "pmc")
welcome_message = "You are a stranded Eridani paramilitary sergeant!<br>You aren't getting paid enough for this shit. Where's the pickup shuttle?"
outfit = /datum/outfit/admin/pod/pmc
outfit = /obj/outfit/admin/pod/pmc
possible_species = list(SPECIES_HUMAN) // no cycler in the pod, spawns in a voidsuit
else if(t == "tcfl")
welcome_message = "You are a stranded member of the Tau Ceti Foreign Legion!<br>Perhaps there was a training accident or maybe something went wrong during a routine operation in the Romanovich Cloud. The Prefect will never let you hear the end of this..."
outfit = /datum/outfit/admin/pod/tcfl
outfit = /obj/outfit/admin/pod/tcfl
possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_DIONA) // TCFL accepts everyone. G1 and G2 have been excluded because they can't wear the hardsuit, which has the suit cooler.
else if(t == "fsf")
welcome_message = "You are a stranded Petty Officer of the Free Solarian Fleets!<br>Your skiff out of the FSFV Sforza was on a routine patrol when an accident or an attack forced you to abandon ship. Thankfully, you seem to be in friendly territory..."
outfit = /datum/outfit/admin/pod/fsf
outfit = /obj/outfit/admin/pod/fsf
possible_species = list(SPECIES_HUMAN)
else if(t == "scc")
welcome_message = "You are a stranded Stellar Corporate Conglomerate low-level functionary!<br>A routine inspection of SCC assets in the Romanovich cloud turned into disaster when your shuttle's reactor suddenly and mysteriously failed. You narrowly escaped with your life. Worst of all? You lost your paperwork."
outfit = /datum/outfit/admin/pod/scc
outfit = /obj/outfit/admin/pod/scc
possible_species = list(SPECIES_HUMAN,SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
else if(t == "fib")
welcome_message = "You are a stranded Federal Investigation Bureau Agent!<br>What was supposed to be a standard investigation turned into a nightmare when the vessel you were supposed to board opened fire! You just managed to reach an escape pod before your own ship was turned into smoldering rubble. You really need some coffee."
outfit = /datum/outfit/admin/pod/bssb
outfit = /obj/outfit/admin/pod/bssb
possible_species = list(SPECIES_HUMAN,SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
else
welcome_message = "You are a stranded drugs smuggler!<br>You shouldn't have had the fucking Tajara pilot your ship. <i>Of course</i> we crashed into a rock. Good thing you've got some of the stuff with you while evacuating - maybe you'll crash somewhere you could sell it for a ticket back?"
outfit = /datum/outfit/admin/pod/smuggler
outfit = /obj/outfit/admin/pod/smuggler
possible_species = list(SPECIES_HUMAN,SPECIES_SKRELL, SPECIES_SKRELL_AXIORI,SPECIES_UNATHI)
/datum/ghostspawner/human/rescuepodsurv/select_spawnlocation(var/use=TRUE)
@@ -86,7 +86,7 @@
//Base equipment for the pod (softsuit + emergency oxygen)
/datum/outfit/admin/pod
/obj/outfit/admin/pod
head = /obj/item/clothing/head/helmet/space/emergency
mask = /obj/item/clothing/mask/breath
id = /obj/item/card/id
@@ -95,7 +95,7 @@
l_ear = /obj/item/device/radio/headset
back = /obj/item/storage/backpack
/datum/outfit/admin/pod/post_equip(mob/living/carbon/human/H, visualsOnly)
/obj/outfit/admin/pod/post_equip(mob/living/carbon/human/H, visualsOnly)
. = ..()
//Turn on the oxygen tank
H.internal = H.s_store
@@ -109,7 +109,7 @@
new /obj/item/clothing/head/helmet/space/emergency(H.loc) // the survivor spawns with no EVA gear,
new /obj/item/tank/emergency_oxygen/double(H.loc) // they can use this, and not just die in space
/datum/outfit/admin/pod/star
/obj/outfit/admin/pod/star
name = "RescuePod - Star"
uniform = "suit selection"
@@ -123,14 +123,14 @@
/obj/item/airbubble = 1
)
/datum/outfit/admin/pod/star/get_id_assignment()
/obj/outfit/admin/pod/star/get_id_assignment()
return "Visitor"
/datum/outfit/admin/pod/star/get_id_rank()
/obj/outfit/admin/pod/star/get_id_rank()
return "Visitor"
/datum/outfit/admin/pod/priest
/obj/outfit/admin/pod/priest
name = "RescuePod - Priest"
uniform = /obj/item/clothing/under/rank/chaplain
@@ -142,14 +142,14 @@
/obj/item/airbubble = 1
)
/datum/outfit/admin/pod/priest/get_id_assignment()
/obj/outfit/admin/pod/priest/get_id_assignment()
return "Priest"
/datum/outfit/admin/pod/priest/get_id_rank()
/obj/outfit/admin/pod/priest/get_id_rank()
return "Priest"
/datum/outfit/admin/pod/rep
/obj/outfit/admin/pod/rep
name = "RescuePod - IdrisRep"
head = /obj/item/clothing/head/beret/corporate/idris
@@ -170,14 +170,14 @@
/obj/item/stamp/idris = 1
)
/datum/outfit/admin/pod/rep/get_id_assignment()
/obj/outfit/admin/pod/rep/get_id_assignment()
return "Corporate Liaison (Idris)"
/datum/outfit/admin/pod/rep/get_id_rank()
/obj/outfit/admin/pod/rep/get_id_rank()
return "Corporate Liaison"
/datum/outfit/admin/pod/smuggler
/obj/outfit/admin/pod/smuggler
name = "RescuePod - Smuggler"
shoes = "shoe selection"
@@ -192,14 +192,14 @@
/obj/item/airbubble = 1
)
/datum/outfit/admin/pod/smuggler/get_id_assignment()
/obj/outfit/admin/pod/smuggler/get_id_assignment()
return "Merchant"
/datum/outfit/admin/pod/smuggler/get_id_rank()
/obj/outfit/admin/pod/smuggler/get_id_rank()
return "Merchant"
/datum/outfit/admin/pod/hunter
/obj/outfit/admin/pod/hunter
name = "RescuePod - Hunter"
head = null
suit = null
@@ -210,14 +210,14 @@
uniform = "pants selection"
back = /obj/item/rig/gunslinger
/datum/outfit/admin/pod/hunter/get_id_assignment()
/obj/outfit/admin/pod/hunter/get_id_assignment()
return "Visitor"
/datum/outfit/admin/pod/hunter/get_id_rank()
/obj/outfit/admin/pod/hunter/get_id_rank()
return "Visitor"
/datum/outfit/admin/pod/occultist
/obj/outfit/admin/pod/occultist
name = "RescuePod - Occultist"
id = /obj/item/card/id
shoes = /obj/item/clothing/shoes/laceup
@@ -230,14 +230,14 @@
/obj/item/airbubble = 1
)
/datum/outfit/admin/pod/occultist/get_id_assignment()
/obj/outfit/admin/pod/occultist/get_id_assignment()
return "Visitor"
/datum/outfit/admin/pod/occultist/get_id_rank()
/obj/outfit/admin/pod/occultist/get_id_rank()
return "Visitor"
/datum/outfit/admin/pod/pmc
/obj/outfit/admin/pod/pmc
name = "RescuePod - PMCG Sergeant"
head = /obj/item/clothing/head/helmet/space/void/cruiser
suit = /obj/item/clothing/suit/space/void/cruiser
@@ -248,13 +248,13 @@
belt = /obj/item/gun/energy/gun/nuclear
uniform = /obj/item/clothing/under/rank/security/pmc
/datum/outfit/admin/pod/pmc/get_id_assignment()
/obj/outfit/admin/pod/pmc/get_id_assignment()
return "Security Officer (PMCG)"
/datum/outfit/admin/pod/pmc/get_id_rank()
/obj/outfit/admin/pod/pmc/get_id_rank()
return "Security Officer"
/datum/outfit/admin/pod/tcfl
/obj/outfit/admin/pod/tcfl
name = "RescuePod - TCFL Member"
head = /obj/item/clothing/head/beret/legion/field
l_ear = /obj/item/device/radio/headset/legion
@@ -280,13 +280,13 @@
/obj/item/device/radio = 1
)
/datum/outfit/admin/pod/tcfl/get_id_assignment()
/obj/outfit/admin/pod/tcfl/get_id_assignment()
return "TCFL"
/datum/outfit/admin/pod/tcfl/get_id_rank()
/obj/outfit/admin/pod/tcfl/get_id_rank()
return "TCFL"
/datum/outfit/admin/pod/fsf
/obj/outfit/admin/pod/fsf
name = "RescuePod - FSF Crewman"
uniform = /obj/item/clothing/under/rank/sol/
shoes = /obj/item/clothing/shoes/jackboots
@@ -311,13 +311,13 @@
/obj/item/clothing/head/sol = 1
)
/datum/outfit/admin/pod/fsf/get_id_assignment()
/obj/outfit/admin/pod/fsf/get_id_assignment()
return "Free Solarian Fleets Crewman"
/datum/outfit/admin/pod/fsf/get_id_rank()
/obj/outfit/admin/pod/fsf/get_id_rank()
return "Free Solarian Fleets Crewman"
/datum/outfit/admin/pod/scc
/obj/outfit/admin/pod/scc
name = "RescuePod - SCC"
uniform = /obj/item/clothing/under/rank/scc
@@ -335,13 +335,13 @@
/datum/outfit/admin/pod/scc/get_id_assignment()
/obj/outfit/admin/pod/scc/get_id_assignment()
return "Stellar Corporate Conglomerate Functionary"
/datum/outfit/admin/pod/scc/get_id_rank()
/obj/outfit/admin/pod/scc/get_id_rank()
return "Stellar Corporate Conglomerate Functionary"
/datum/outfit/admin/pod/bssb
/obj/outfit/admin/pod/bssb
name = "RescuePod - BSSB" // Doctor Pavel, I'm FIB.
uniform = /obj/item/clothing/under/rank/bssb
@@ -363,10 +363,10 @@
/datum/outfit/admin/pod/bssb/get_id_assignment()
/obj/outfit/admin/pod/bssb/get_id_assignment()
return "Federal Investigation Bureau Agent"
/datum/outfit/admin/pod/bssb/get_id_rank()
/obj/outfit/admin/pod/bssb/get_id_rank()
return "Federal Investigation Bureau Agent"
@@ -377,9 +377,9 @@
/datum/ghostspawner/human/rescuepodsurv/burglar/New()
welcome_message = "You're a petty criminal on the run from the law!<br>After a failed bit of theft and larceny, you've found yourself in an escape pod hurtling toward the [station_name()]. You'll probably end up incarcerated or dead, but...with a great risk comes great rewards. Maybe you can make a big score after all?"
outfit = /datum/outfit/admin/pod/burglar
outfit = /obj/outfit/admin/pod/burglar
/datum/outfit/admin/pod/burglar
/obj/outfit/admin/pod/burglar
name = "RescuePod - Burglar"
uniform = list(
@@ -418,7 +418,7 @@
backpack_contents = list()
/datum/outfit/admin/pod/burglar/post_equip(mob/living/carbon/human/H, visualsOnly)
/obj/outfit/admin/pod/burglar/post_equip(mob/living/carbon/human/H, visualsOnly)
. = ..()
if (visualsOnly)
return
code/modules/ghostroles/spawner/human/human.dm
+2 -2
View File
@@ -11,7 +11,7 @@
variables = list() //Variables of that mob
//Vars related to human mobs
var/datum/outfit/outfit = null //Outfit to equip
var/obj/outfit/outfit = null //Outfit to equip
var/list/species_outfits = list() //Outfit overwrite for the species
var/uses_species_whitelist = TRUE //Do you need the whitelist to play the species?
var/possible_species = list(SPECIES_HUMAN)
@@ -140,7 +140,7 @@
//Setup the Outfit
if(picked_species in species_outfits)
var/datum/outfit/species_outfit = species_outfits[picked_species]
var/obj/outfit/species_outfit = species_outfits[picked_species]
M.preEquipOutfit(species_outfit, FALSE)
M.equipOutfit(species_outfit, FALSE)
else if(outfit)
code/modules/ghostroles/spawner/human/merchant.dm
+1 -1
View File
@@ -10,7 +10,7 @@
max_count = 1
//Vars related to human mobs
outfit = /datum/outfit/merchant_assistant
outfit = /obj/outfit/merchant_assistant
possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_DIONA)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
code/modules/ghostroles/spawner/human/pra.dm
+4 -4
View File
@@ -10,7 +10,7 @@
max_count = 3
uses_species_whitelist = FALSE
outfit = /datum/outfit/admin/pra_cosmonaut
outfit = /obj/outfit/admin/pra_cosmonaut
possible_species = list(SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -30,10 +30,10 @@
assigned_role = "Party Commissar"
special_role = "Party Commissar"
outfit = /datum/outfit/admin/pra_cosmonaut/commissar
outfit = /obj/outfit/admin/pra_cosmonaut/commissar
possible_species = list(SPECIES_TAJARA, SPECIES_TAJARA_MSAI)
/datum/outfit/admin/pra_cosmonaut
/obj/outfit/admin/pra_cosmonaut
name = "Kosmostrelki"
uniform = /obj/item/clothing/under/tajaran/cosmonaut
@@ -51,7 +51,7 @@
)
r_hand = /obj/item/storage/field_ration
/datum/outfit/admin/pra_cosmonaut/commissar
/obj/outfit/admin/pra_cosmonaut/commissar
name = "Party Commissar"
uniform = /obj/item/clothing/under/tajaran/cosmonaut/commissar
code/modules/ghostroles/spawner/human/responseteams/ap_eridani.dm
+4 -4
View File
@@ -6,7 +6,7 @@
desc = "A specialist suited for close asset protection and policing duties. Ensure your colleagues ledgers remain in the black."
welcome_message = "You are part of an Eridani Private Military Company Asset Protection Team, a highly trained group of security specialists and medical professionals \
contracted by the Stellar Corporate Conglomerate to protect its investments."
outfit = /datum/outfit/admin/ert/ap_eridani
outfit = /obj/outfit/admin/ert/ap_eridani
possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD)
/datum/ghostspawner/human/ert/ap_eridani/lead
@@ -15,7 +15,7 @@
mob_name_prefix = "Ldr. "
max_count = 1
desc = "The leader of the EPMC Asset Protection Team. Ensure your employers bottom line remains protected and don't sign blindly."
outfit = /datum/outfit/admin/ert/ap_eridani/lead
outfit = /obj/outfit/admin/ert/ap_eridani/lead
possible_species = list(SPECIES_HUMAN)
/datum/ghostspawner/human/ert/ap_eridani/doctor
@@ -24,7 +24,7 @@
mob_name_prefix = "Dr. "
max_count = 1
desc = "A highly trained Eridani medical officer and the second in command of the EPMC Asset Protection Team. Well versed in surgical procedures and expected to work in a hot zone. Not a stranger to a bank run."
outfit = /datum/outfit/admin/ert/ap_eridani/doctor
outfit = /obj/outfit/admin/ert/ap_eridani/doctor
possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC_SHELL)
/datum/ghostspawner/human/ert/ap_eridani/corpsman
@@ -33,5 +33,5 @@
mob_name_prefix = "Cm. "
max_count = 2
desc = "An Eridani corpsman that can handle nursing duties as well. Trained to operate in combat environments if needed. Make sure to check your quarterlies."
outfit = /datum/outfit/admin/ert/ap_eridani/corpsman
outfit = /obj/outfit/admin/ert/ap_eridani/corpsman
possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
code/modules/ghostroles/spawner/human/responseteams/corporate/hephaestus.dm
+4 -4
View File
@@ -4,7 +4,7 @@
desc = "A responder from a Hephaestus Industries asset protection squad."
max_count = 2
welcome_message = "You are a member of a Hephaestus heavy asset protection squad. You have recieved a distress call, and been dispatched to investigate. Obey your commander's orders."
outfit = /datum/outfit/admin/ert/hephaestus
outfit = /obj/outfit/admin/ert/hephaestus
possible_species = list(SPECIES_HUMAN, SPECIES_UNATHI)
/datum/ghostspawner/human/ert/hephaestus/medical
@@ -12,20 +12,20 @@
short_name = "hephmed"
desc = "A medical specialist from a Hephaestus Industries asset protection squad."
max_count = 1
outfit = /datum/outfit/admin/ert/hephaestus/medic
outfit = /obj/outfit/admin/ert/hephaestus/medic
/datum/ghostspawner/human/ert/hephaestus/engineer
name = "Hephaestus Industries Engineering Specialist"
short_name = "hepheng"
desc = "An engineering specialist from a Hephaestus Industries asset protection squad."
max_count = 1
outfit = /datum/outfit/admin/ert/hephaestus/engi
outfit = /obj/outfit/admin/ert/hephaestus/engi
/datum/ghostspawner/human/ert/hephaestus/leader
name = "Hephaestus Industries Squad Leader"
short_name = "hephlead"
desc = "The commander of a Hephaestus Industries asset protection squad."
max_count = 1
outfit = /datum/outfit/admin/ert/hephaestus/leader
outfit = /obj/outfit/admin/ert/hephaestus/leader
welcome_message = "You are the commander of a Hephaestus heavy asset protection squad. You have recieved a distress call, and been dispatched to investigate. Lead your team."
code/modules/ghostroles/spawner/human/responseteams/corporate/nt_ert.dm
+3 -3
View File
@@ -4,7 +4,7 @@
desc = "A responder of the NanoTrasen Phoenix ERT."
welcome_message = "You're part of the NanoTrasen Phoenix ERT, stationed at the Odin. Your usual powers apply here."
max_count = 2
outfit = /datum/outfit/admin/ert/nanotrasen
outfit = /obj/outfit/admin/ert/nanotrasen
mob_name_prefix = "Tpr. "
possible_species = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
spawnpoints = list("NTERTSpawn")
@@ -14,14 +14,14 @@
short_name = "nteng"
desc = "An engineering specialist of the NanoTrasen Phoenix ERT."
max_count = 1
outfit = /datum/outfit/admin/ert/nanotrasen/specialist
outfit = /obj/outfit/admin/ert/nanotrasen/specialist
mob_name_prefix = "S/Tpr. "
/datum/ghostspawner/human/ert/nanotrasen/specialist/med
name = "NanoTrasen Medical Specialist"
short_name = "ntmed"
desc = "A medical specialist of the NanoTrasen Phoenix ERT."
outfit = /datum/outfit/admin/ert/nanotrasen/specialist/medical
outfit = /obj/outfit/admin/ert/nanotrasen/specialist/medical
/datum/ghostspawner/human/ert/nanotrasen/leader
name = "NanoTrasen Leader"
code/modules/ghostroles/spawner/human/responseteams/corporate/scc_ert.dm
+4 -4
View File
@@ -4,7 +4,7 @@
desc = "A Stellar Corporate Conglomerate emergency responder."
welcome_message = "You are part of an SCC asset protection squad, sent in response to a distress call. Obey your commander and safeguard SCC assets."
max_count = 2
outfit = /datum/outfit/admin/ert/scc
outfit = /obj/outfit/admin/ert/scc
mob_name_prefix = "Tpr. "
possible_species = list(SPECIES_HUMAN) //no one made an scc skrellmet
spawnpoints = list("NTERTSpawn")
@@ -15,14 +15,14 @@
desc = "An engineering specialist of the Stellar Corporate Conglomerate ERT."
max_count = 1
mob_name_prefix = "S/Tpr. "
outfit = /datum/outfit/admin/ert/scc/engineer
outfit = /obj/outfit/admin/ert/scc/engineer
/datum/ghostspawner/human/ert/scc/medic
name = "SCC Medical Specialist"
short_name = "sccmed"
desc = "A medical specialist of the Stellar Corporate Conglomerate ERT."
max_count = 1
outfit = /datum/outfit/admin/ert/scc/medic
outfit = /obj/outfit/admin/ert/scc/medic
/datum/ghostspawner/human/ert/scc/commander
name = "SCC ERT Commander"
@@ -30,4 +30,4 @@
desc = "The commander of the Stellar Corporate Conglomerate ERT."
max_count = 1
mob_name_prefix = "L/Tpr. "
outfit = /datum/outfit/admin/ert/scc/commander
outfit = /obj/outfit/admin/ert/scc/commander
code/modules/ghostroles/spawner/human/responseteams/deathsquad.dm
+2 -2
View File
@@ -3,7 +3,7 @@
short_name = "ntaps"
max_count = 3
desc = "Protectors of the SCC's bottom line. The last thing you never see."
outfit = /datum/outfit/admin/deathsquad
outfit = /obj/outfit/admin/deathsquad
spawnpoints = list("DeathERTSpawn")
possible_species = list(SPECIES_HUMAN)
mob_name_prefix = "Spec. "
@@ -19,7 +19,7 @@
short_name = "ntapl"
max_count = 1
desc = "Leader of SCC's Asset Protection team."
outfit = /datum/outfit/admin/deathsquad/leader
outfit = /obj/outfit/admin/deathsquad/leader
mob_name_prefix = "Ldr. "
/datum/ghostspawner/human/ert/deathsquad/post_spawn(mob/user)
code/modules/ghostroles/spawner/human/responseteams/human/coalition.dm
+8 -8
View File
@@ -4,7 +4,7 @@
max_count = 3
desc = "Rank and file of the Frontier Ranger response team."
welcome_message = "You are a Ranger with the Frontier Protection Bureau. Your vessel has recieved a distress signal, and you were sent to investigate. Obey the orders of your commander."
outfit = /datum/outfit/admin/ert/coalition
outfit = /obj/outfit/admin/ert/coalition
possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD)
/datum/ghostspawner/human/ert/coalition/medic
@@ -12,14 +12,14 @@
short_name = "cocm"
max_count = 1
desc = "Medical specialist of the Frontier Ranger response team."
outfit = /datum/outfit/admin/ert/coalition/medic
outfit = /obj/outfit/admin/ert/coalition/medic
/datum/ghostspawner/human/ert/coalition/engineer
name = "Coalition Ranger Sapper"
short_name = "coce"
max_count = 1
desc = "Sapper and engineering specialist of the Frontier Ranger response team."
outfit = /datum/outfit/admin/ert/coalition/sapper
outfit = /obj/outfit/admin/ert/coalition/sapper
/datum/ghostspawner/human/ert/coalition/leader
name = "Coalition Ranger Squad Leader"
@@ -27,14 +27,14 @@
max_count = 1
desc = "Commander of the Frontier Ranger response team."
welcome_message = "You are the commander of a Frontier Ranger patrol vessel. While on patrol, your ship received a distress signal and you were sent to investigate. Lead your team."
outfit = /datum/outfit/admin/ert/coalition/leader
outfit = /obj/outfit/admin/ert/coalition/leader
/datum/ghostspawner/human/ert/konyang
name = "Konyang Aerospace Force Crewman"
short_name = "konc"
desc = "Rank and file of the Konyang Aerospace Force"
welcome_message = "You are a crewman with the Konyang Aerospace Force. You have recieved a distress signal and been dispatched to investigate. Obey your commander."
outfit = /datum/outfit/admin/ert/konyang
outfit = /obj/outfit/admin/ert/konyang
max_count = 3
mob_name_prefix = "PO3. "
possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_IPC, SPECIES_IPC_BISHOP, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_SHELL, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU)
@@ -44,7 +44,7 @@
short_name = "konm"
desc = "Medical specialist of the Konyang Aerospace Force."
mob_name_prefix = "PO2. "
outfit = /datum/outfit/admin/ert/konyang/medic
outfit = /obj/outfit/admin/ert/konyang/medic
max_count = 1
/datum/ghostspawner/human/ert/konyang/sapper
@@ -52,7 +52,7 @@
short_name = "kons"
desc = "Sapper and engineering specialist of the Konyang Aerospace Force."
mob_name_prefix = "PO1. "
outfit = /datum/outfit/admin/ert/konyang/sapper
outfit = /obj/outfit/admin/ert/konyang/sapper
max_count = 1
/datum/ghostspawner/human/ert/konyang/leader
@@ -61,5 +61,5 @@
desc = "Commander of the Konyang Aerospace Force response team."
welcome_message = "You are an officer of the Konyang Aerospace Force. While on patrol, your ship received a distress signal and you were sent to investigate. Lead your team."
mob_name_prefix = "LT. "
outfit = /datum/outfit/admin/ert/konyang/leader
outfit = /obj/outfit/admin/ert/konyang/leader
max_count = 1
code/modules/ghostroles/spawner/human/responseteams/human/elyra.dm
+5 -5
View File
@@ -5,7 +5,7 @@
welcome_message = "You're a member of the Elyran Navy. While on patrol, your ship received a distress signal and you were sent to investigate. Obey the orders of your commander."
max_count = 3
mob_name_prefix = "Cm. "
outfit = /datum/outfit/admin/ert/elyran_trooper
outfit = /obj/outfit/admin/ert/elyran_trooper
possible_species = list(SPECIES_HUMAN)
extra_languages = list(LANGUAGE_ELYRAN_STANDARD)
@@ -17,7 +17,7 @@
welcome_message = "You're an officer of the Elyran Navy. While on patrol, your ship received a distress signal and you were sent to investigate. Lead your team."
mob_name_prefix = "Ens. "
max_count = 1
outfit = /datum/outfit/admin/ert/elyran_trooper/leader
outfit = /obj/outfit/admin/ert/elyran_trooper/leader
/datum/ghostspawner/human/ert/elyra/engineer
short_name = "elyra_engtrooper"
@@ -25,7 +25,7 @@
desc = "The engineering trooper of the Elyran Navy team."
mob_name_prefix = "PO3. "
max_count = 1
outfit = /datum/outfit/admin/ert/elyran_trooper/engineer
outfit = /obj/outfit/admin/ert/elyran_trooper/engineer
/datum/ghostspawner/human/ert/elyra/heavy
short_name = "elyra_heavy"
@@ -33,7 +33,7 @@
desc = "The heavy trooper of the Elyran Navy team."
mob_name_prefix = "PO3. "
max_count = 1
outfit = /datum/outfit/admin/ert/elyran_trooper/heavy
outfit = /obj/outfit/admin/ert/elyran_trooper/heavy
/datum/ghostspawner/human/ert/elyra/medical
short_name = "elyra_medtrooper"
@@ -41,4 +41,4 @@
desc = "The medical trooper of the Elyran Navy team."
mob_name_prefix = "PO3. "
max_count = 1
outfit = /datum/outfit/admin/ert/elyran_trooper/medical
outfit = /obj/outfit/admin/ert/elyran_trooper/medical
code/modules/ghostroles/spawner/human/responseteams/human/fsf.dm
+5 -5
View File
@@ -4,7 +4,7 @@
desc = "A responder from a Free Solarian Fleets marine fireteam."
welcome_message = "You're part of a marine fireteam dispatched from the FSFV Sforza, a Free Solarian Fleets destroyer on the SCC's payroll. Your primary motivation is money: the SCC pays you well, and you have a job to do."
max_count = 2
outfit = /datum/outfit/admin/ert/fsf
outfit = /obj/outfit/admin/ert/fsf
mob_name_prefix = "Pfc. "
possible_species = list(SPECIES_HUMAN)
@@ -13,21 +13,21 @@
short_name = "fsfeng"
desc = "An engineering specialist from a Free Solarian Fleets marine fireteam."
max_count = 1
outfit = /datum/outfit/admin/ert/fsf/sapper
outfit = /obj/outfit/admin/ert/fsf/sapper
mob_name_prefix = "Cpl. "
/datum/ghostspawner/human/ert/fsf/specialist/med
name = "Free Solarian Fleets Medic"
short_name = "fsfmed"
desc = "A medical specialist from a Free Solarian Fleets marine fireteam."
outfit = /datum/outfit/admin/ert/fsf/medic
outfit = /obj/outfit/admin/ert/fsf/medic
/datum/ghostspawner/human/ert/fsf/leader
name = "Free Solarian Fleets Fireteam Leader"
short_name = "fsflead"
desc = "The leader of the Free Solarian Fleets marine fireteam."
max_count = 1
outfit = /datum/outfit/admin/ert/fsf/leader
outfit = /obj/outfit/admin/ert/fsf/leader
mob_name_prefix = "Sgt. "
/datum/ghostspawner/human/ert/fsf/synth
@@ -35,7 +35,7 @@
short_name = "fsfsynth"
desc = "The non-combatant synthetic unit of the Free Solarian Fleets marine fireteam, armed only for self-defense. Tasked with piloting the shuttle and providing tactical advice and overwatch. Not actually a marine itself, the synth is property of the FSF."
max_count = 1
outfit = /datum/outfit/admin/ert/fsf/synth
outfit = /obj/outfit/admin/ert/fsf/synth
mob_name_prefix = null
possible_species = list(SPECIES_IPC)
code/modules/ghostroles/spawner/human/responseteams/iac.dm
+3 -3
View File
@@ -5,7 +5,7 @@
max_count = 3
desc = "A highly trained doctor. Can do most medical procedures even under severe stress. The de-facto lead of the IAC response team."
welcome_message = "You are part of the Interstellar Aid Corps, an intergalactic entity set on aiding all in need."
outfit = /datum/outfit/admin/ert/iac
outfit = /obj/outfit/admin/ert/iac
possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
/datum/ghostspawner/human/ert/iac/bodyguard
@@ -14,7 +14,7 @@
mob_name_prefix = "Bdg. "
max_count = 2
desc = "A highly trained bodyguard. Sticks close to the medics while they work."
outfit = /datum/outfit/admin/ert/iac/bodyguard
outfit = /obj/outfit/admin/ert/iac/bodyguard
/datum/ghostspawner/human/ert/iac/paramedic
name = "IAC Paramedic"
@@ -22,4 +22,4 @@
mob_name_prefix = "Pm. "
max_count = 2
desc = "A highly trained paramedic. You grab injured people and bring them to the doctor. You are trained in nursing duties as well."
outfit = /datum/outfit/admin/ert/iac/paramedic
outfit = /obj/outfit/admin/ert/iac/paramedic
code/modules/ghostroles/spawner/human/responseteams/mercenary.dm
+4 -4
View File
@@ -4,7 +4,7 @@
max_count = 2
desc = "Rank and file of a freelancer mercenary team."
welcome_message = "Your crew has been hired by NanoTrasen to sort out a distress signal. While you wouldn't do anything violent to the crew, maybe they won't miss that one fancy artifact..."
outfit = /datum/outfit/admin/ert/mercenary
outfit = /obj/outfit/admin/ert/mercenary
possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
/datum/ghostspawner/human/ert/mercenary/specialist
@@ -12,18 +12,18 @@
short_name = "mercs"
max_count = 1
desc = "The only medic of the freelancer mercenary team."
outfit = /datum/outfit/admin/ert/mercenary/specialist
outfit = /obj/outfit/admin/ert/mercenary/specialist
/datum/ghostspawner/human/ert/mercenary/engineer
name = "Mercenary Combat Engineer"
short_name = "merce"
max_count = 1
desc = "The only dedicated engineer of the freelancer mercenary team."
outfit = /datum/outfit/admin/ert/mercenary/engineer
outfit = /obj/outfit/admin/ert/mercenary/engineer
/datum/ghostspawner/human/ert/mercenary/leader
name = "Mercenary Leader"
short_name = "mercl"
max_count = 1
desc = "The leader of the freelancer mercenary team."
outfit = /datum/outfit/admin/ert/mercenary/leader
outfit = /obj/outfit/admin/ert/mercenary/leader
code/modules/ghostroles/spawner/human/responseteams/syndicate.dm
+2 -2
View File
@@ -3,7 +3,7 @@
short_name = "syndc"
max_count = 3
desc = "Well-equipped commandos of the criminal Syndicate."
outfit = /datum/outfit/admin/deathsquad/syndicate
outfit = /obj/outfit/admin/deathsquad/syndicate
spawnpoints = list("SyndERTSpawn")
/datum/ghostspawner/human/ert/commando/New()
@@ -15,7 +15,7 @@
short_name = "syndl"
max_count = 1
desc = "The leader of the Syndicate's elite commandos."
outfit = /datum/outfit/admin/deathsquad/syndicate/leader
outfit = /obj/outfit/admin/deathsquad/syndicate/leader
/datum/ghostspawner/human/ert/commando/post_spawn(mob/user)
var/datum/martial_art/sol_combat/F = new/datum/martial_art/sol_combat(null)
code/modules/ghostroles/spawner/human/responseteams/tajara/kosmostrelki.dm
+6 -6
View File
@@ -8,7 +8,7 @@
welcome_message = "You are part of the People's Republic of Adhomai Kosmostrelki. Listen to the commander, but do not ignore the Commissar as they are the Party's eyes."
outfit = /datum/outfit/admin/ert/pra_cosmonaut
outfit = /obj/outfit/admin/ert/pra_cosmonaut
possible_species = list(SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN)
extra_languages = list(LANGUAGE_SIIK_MAAS)
@@ -22,7 +22,7 @@
mob_name_prefix = "Alm."
max_count = 1
outfit = /datum/outfit/admin/ert/pra_cosmonaut/commissar
outfit = /obj/outfit/admin/ert/pra_cosmonaut/commissar
possible_species = list(SPECIES_TAJARA, SPECIES_TAJARA_MSAI)
@@ -34,7 +34,7 @@
max_count = 1
mob_name_prefix = "Akh."
outfit = /datum/outfit/admin/ert/pra_cosmonaut/commander
outfit = /obj/outfit/admin/ert/pra_cosmonaut/commander
possible_species = list(SPECIES_TAJARA, SPECIES_TAJARA_MSAI)
/datum/ghostspawner/human/ert/pra_cosmonaut/tesla
@@ -45,7 +45,7 @@
max_count = 1
outfit = /datum/outfit/admin/ert/pra_cosmonaut/tesla
outfit = /obj/outfit/admin/ert/pra_cosmonaut/tesla
possible_species = list(SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN)
/datum/ghostspawner/human/ert/pra_cosmonaut/medic
@@ -56,7 +56,7 @@
max_count = 1
outfit = /datum/outfit/admin/ert/pra_cosmonaut/medic
outfit = /obj/outfit/admin/ert/pra_cosmonaut/medic
possible_species = list(SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN)
/datum/ghostspawner/human/ert/pra_cosmonaut/engineer
@@ -67,5 +67,5 @@
max_count = 1
outfit = /datum/outfit/admin/ert/pra_cosmonaut/engineer
outfit = /obj/outfit/admin/ert/pra_cosmonaut/engineer
possible_species = list(SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN)
code/modules/ghostroles/spawner/human/responseteams/tcfl.dm
+4 -4
View File
@@ -4,7 +4,7 @@
desc = "The Tau Ceti Foreign Legion's rank and file."
welcome_message = "The Tau Ceti Foreign Legion works for the Republic of Biesel; your job is to protect the place you're heading to and fix the problem. You can be a Volunteer (Vol.), Legionnaire (Lgn.) or Prefect (Pfct.). The first option is recommended for new players."
max_count = 3
outfit = /datum/outfit/admin/ert/legion
outfit = /obj/outfit/admin/ert/legion
spawnpoints = list("TCFLERTSpawn")
possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_DIONA, SPECIES_DIONA_COEUS)
mob_name_prefix = "Vol. "
@@ -14,7 +14,7 @@
short_name = "tcfls"
max_count = 2
desc = "An experienced Legionnaire of the TCFL."
outfit = /datum/outfit/admin/ert/legion/specialist
outfit = /obj/outfit/admin/ert/legion/specialist
mob_name_prefix = "Lgn. "
/datum/ghostspawner/human/ert/tcfl/leader
@@ -22,7 +22,7 @@
short_name = "tcfll"
max_count = 1
desc = "A leader of Task Force XIII - Fortune."
outfit = /datum/outfit/admin/ert/legion/leader
outfit = /obj/outfit/admin/ert/legion/leader
mob_name_prefix = "Pfct. "
spawnpoints = list("TCFLERTSpawn - Prefect")
@@ -32,6 +32,6 @@
max_count = 1
desc = "A dropship pilot of the TCFL."
welcome_message = "As a pilot of the Tau Ceti Foreign Legion, your job is to pilot your assigned dropship and keep it safe from any hostile forces. You may also have to assist the main task force in a supporting role if the need arises."
outfit = /datum/outfit/admin/ert/legion/pilot
outfit = /obj/outfit/admin/ert/legion/pilot
mob_name_prefix = "PL. "
spawnpoints = list("TCFLERTSpawn - Pilot")
code/modules/ghostroles/spawner/human/responseteams/unathi/kataphracts.dm
+4 -4
View File
@@ -3,7 +3,7 @@
short_name = "kathope"
desc = "A Zo'saa (squire) of the local Kataphract Guild."
max_count = 2
outfit = /datum/outfit/admin/ert/kataphract
outfit = /obj/outfit/admin/ert/kataphract
mob_name_prefix = "Zosaa "
uses_species_whitelist = FALSE // Anyone should be able to play a Kataphract Unathi
possible_species = list(SPECIES_UNATHI)
@@ -18,7 +18,7 @@
short_name = "katklax"
desc = "A Zo'saa (squire) from the K'lax Hive, here to learn from Unathi Knights what it means to be honourable."
max_count = 1
outfit = /datum/outfit/admin/ert/kataphract/klax
outfit = /obj/outfit/admin/ert/kataphract/klax
mob_name_prefix = "Zosaa "
possible_species = list(SPECIES_VAURCA_WARRIOR)
extra_languages = list(LANGUAGE_VAURCA)
@@ -31,7 +31,7 @@
short_name = "katspec"
desc = "A Zo'saa (squire) trained in medicine from the local Kataphract guild."
max_count = 1
outfit = /datum/outfit/admin/ert/kataphract/specialist
outfit = /obj/outfit/admin/ert/kataphract/specialist
mob_name_prefix = "Zosaa "
/datum/ghostspawner/human/ert/kataphract/leader
@@ -39,5 +39,5 @@
short_name = "katlead"
desc = "A brave Saa (Knight) of the local Kataphract Guild. Two together operate as leaders of the team."
max_count = 2
outfit = /datum/outfit/admin/ert/kataphract/leader
outfit = /obj/outfit/admin/ert/kataphract/leader
mob_name_prefix = "Saa "
code/modules/ghostroles/spawner/human/visitor.dm
+1 -1
View File
@@ -11,7 +11,7 @@
show_on_job_select = FALSE
//Vars related to human mobs
outfit = /datum/outfit/admin/random/visitor
outfit = /obj/outfit/admin/random/visitor
possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_IPC_G1, SPECIES_IPC_G2)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
code/modules/ghostroles/spawner/human/zenghu.dm
+2 -2
View File
@@ -11,7 +11,7 @@
away_site = TRUE
outfit = /datum/outfit/admin/zenghu_survivor
outfit = /obj/outfit/admin/zenghu_survivor
possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -19,7 +19,7 @@
special_role = "Zeng-Hu Survivor"
respawn_flag = null
/datum/outfit/admin/zenghu_survivor
/obj/outfit/admin/zenghu_survivor
name = "Zeng-Hu Employee"
uniform = /obj/item/clothing/under/rank/scientist
code/modules/mob/inventory.dm
+2 -2
View File
@@ -492,7 +492,7 @@ var/list/slot_equipment_priority = list( \
. += I
/mob/living/carbon/human/proc/equipOutfit(outfit, visualsOnly = FALSE)
var/datum/outfit/O = null
var/obj/outfit/O = null
if(ispath(outfit))
O = new outfit
@@ -506,7 +506,7 @@ var/list/slot_equipment_priority = list( \
return O.equip(src, visualsOnly)
/mob/living/carbon/human/proc/preEquipOutfit(outfit, visualsOnly = FALSE)
var/datum/outfit/O = null
var/obj/outfit/O = null
if(ispath(outfit))
O = new outfit
code/modules/mob/living/carbon/slime/items.dm
+2 -2
View File
@@ -326,8 +326,8 @@
G.accent = G.origin.possible_accents[1]
G.citizenship = G.origin.possible_citizenships[1]
G.religion = G.origin.possible_religions[1]
G.preEquipOutfit(/datum/outfit/admin/golem, FALSE)
G.equipOutfit(/datum/outfit/admin/golem, FALSE)
G.preEquipOutfit(/obj/outfit/admin/golem, FALSE)
G.equipOutfit(/obj/outfit/admin/golem, FALSE)
G.client.init_verbs()
to_chat(G, SPAN_NOTICE("You are a golem. Serve your master, and assist them in completing their goals at any cost."))
html/changelogs/DreamySkrell-outfit-obj.yml
+8
View File
@@ -0,0 +1,8 @@
author: DreamySkrell
delete-after: True
changes:
- rscadd: "Refactored `/datum/outfit` to `/obj/outfit`."
- rscadd: "Outfits can be mapped in or spawned manually, to spill all their items on the floor."
icons/effects/map_effects.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

maps/away/away_site/konyang/point_verdant/point_verdant_ghostroles.dm
+50 -50
View File
@@ -6,14 +6,14 @@
tags = list("External")
spawnpoints = list("konyang_zh")
max_count = 2
outfit = /datum/outfit/admin/konyang_zh
outfit = /obj/outfit/admin/konyang_zh
possible_species = list(SPECIES_HUMAN, SPECIES_IPC, SPECIES_IPC_BISHOP, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_SHELL, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
assigned_role = "Zeng-Hu Pharmaceuticals Corporate Personnel"
special_role = "Zeng-Hu Pharmaceuticals Corporate Personnel"
respawn_flag = null
/datum/outfit/admin/konyang_zh
/obj/outfit/admin/konyang_zh
name = "Zeng-Hu Pharmaceuticals Employee"
uniform = /obj/item/clothing/under/rank/liaison/zeng
shoes = /obj/item/clothing/shoes/laceup
@@ -23,7 +23,7 @@
suit = /obj/item/clothing/suit/storage/toggle/corp/zeng
r_pocket = /obj/item/storage/wallet/random
/datum/outfit/admin/konyang_zh/get_id_access()
/obj/outfit/admin/konyang_zh/get_id_access()
return list(ACCESS_KONYANG_CORPORATE)
/datum/ghostspawner/human/konyang_ee
@@ -33,14 +33,14 @@
tags = list("External")
spawnpoints = list("konyang_ee")
max_count = 2
outfit = /datum/outfit/admin/konyang_ee
outfit = /obj/outfit/admin/konyang_ee
possible_species = list(SPECIES_HUMAN, SPECIES_IPC, SPECIES_IPC_BISHOP, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_SHELL, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
assigned_role = "Einstein Engines Corporate Personnel"
special_role = "Einstein Engines Corporate Personnel"
respawn_flag = null
/datum/outfit/admin/konyang_ee
/obj/outfit/admin/konyang_ee
name = "Einstein Engines Employee"
uniform = /obj/item/clothing/under/rank/liaison/einstein
shoes = /obj/item/clothing/shoes/laceup
@@ -48,7 +48,7 @@
back = /obj/item/storage/backpack/satchel
r_pocket = /obj/item/storage/wallet/random
/datum/outfit/admin/konyang_ee/get_id_access()
/obj/outfit/admin/konyang_ee/get_id_access()
return list(ACCESS_KONYANG_CORPORATE)
//Police
@@ -59,14 +59,14 @@
tags = list("External")
spawnpoints = list("konyang_cop")
max_count = 2
outfit = /datum/outfit/admin/konyang_cop
outfit = /obj/outfit/admin/konyang_cop
possible_species = list(SPECIES_HUMAN, SPECIES_IPC, SPECIES_IPC_BISHOP, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_SHELL, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
assigned_role = "Konyang National Police Patrolman"
special_role = "Konyang National Police Patrolman"
respawn_flag = null
/datum/outfit/admin/konyang_cop
/obj/outfit/admin/konyang_cop
name = "Konyang Police Officer"
uniform = /obj/item/clothing/under/rank/konyang/police
accessory = /obj/item/clothing/accessory/holster/hip
@@ -78,7 +78,7 @@
r_pocket = /obj/item/storage/wallet/random
back = /obj/item/storage/backpack/satchel
/datum/outfit/admin/konyang_cop/get_id_access()
/obj/outfit/admin/konyang_cop/get_id_access()
return list(ACCESS_KONYANG_POLICE)
/datum/ghostspawner/human/konyang_cop/senior
@@ -96,9 +96,9 @@
max_count = 1
assigned_role = "Konyang National Police Superintendent"
special_role = "Konyang National Police Superintendent"
outfit = /datum/outfit/admin/konyang_cop/superintendent
outfit = /obj/outfit/admin/konyang_cop/superintendent
/datum/outfit/admin/konyang_cop/superintendent
/obj/outfit/admin/konyang_cop/superintendent
name = "Konyang Police Superintendent"
uniform = /obj/item/clothing/under/rank/konyang/police/lieutenant
head = /obj/item/clothing/head/konyang/police/lieutenant
@@ -112,14 +112,14 @@
tags = list("External")
spawnpoints = list("konyang_goon")
max_count = 3
outfit = /datum/outfit/admin/konyang_goon
outfit = /obj/outfit/admin/konyang_goon
possible_species = list(SPECIES_HUMAN, SPECIES_IPC, SPECIES_IPC_BISHOP, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_SHELL, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
assigned_role = "5-Cheung Thug"
special_role = "5-Cheung Thug"
respawn_flag = null
/datum/outfit/admin/konyang_goon
/obj/outfit/admin/konyang_goon
name = "5-Cheung Thug"
uniform = /obj/item/clothing/under/pants/tan
shoes = /obj/item/clothing/shoes/sneakers/black
@@ -134,12 +134,12 @@
desc = "Manage the local operations of 5-Cheung. Establish an understanding with the Superintendent. Make yourself a force in the community."
max_count = 1
spawnpoints = list("konyang_goon_boss")
outfit = /datum/outfit/admin/konyang_mob_boss
outfit = /obj/outfit/admin/konyang_mob_boss
assigned_role = "5-Cheung Boss"
special_role = "5-Cheung Boss"
respawn_flag = null
/datum/outfit/admin/konyang_mob_boss
/obj/outfit/admin/konyang_mob_boss
name = "5-Cheung Boss"
uniform = /obj/item/clothing/under/suit_jacket/white
shoes = /obj/item/clothing/shoes/laceup
@@ -156,14 +156,14 @@
max_count = 6
tags = list("External")
spawnpoints = list("konyang_vendor")
outfit = /datum/outfit/admin/konyang_vendor
outfit = /obj/outfit/admin/konyang_vendor
possible_species = list(SPECIES_HUMAN, SPECIES_IPC, SPECIES_IPC_BISHOP, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_SHELL, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
assigned_role = "Point Verdant Vendor"
special_role = "Point Verdant Vendor"
respawn_flag = null
/datum/outfit/admin/konyang_vendor
/obj/outfit/admin/konyang_vendor
name = "Konyang Vendor"
uniform = /obj/item/clothing/under/pants/jeans
shoes = /obj/item/clothing/shoes/sneakers/black
@@ -172,7 +172,7 @@
l_pocket = /obj/item/storage/wallet/random
id = /obj/item/card/id
/datum/outfit/admin/konyang_vendor/get_id_access()
/obj/outfit/admin/konyang_vendor/get_id_access()
return list(ACCESS_KONYANG_VENDORS)
/datum/ghostspawner/human/konyang_clinic
@@ -182,14 +182,14 @@
max_count = 2
tags = list("External")
spawnpoints = list("konyang_clinic")
outfit = /datum/outfit/admin/konyang_clinic
outfit = /obj/outfit/admin/konyang_clinic
possible_species = list(SPECIES_HUMAN, SPECIES_IPC, SPECIES_IPC_BISHOP, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_SHELL, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
assigned_role = "Konyang Robotics Company Doctor"
special_role = "Konyang Robotics Company Doctor"
respawn_flag = null
/datum/outfit/admin/konyang_clinic
/obj/outfit/admin/konyang_clinic
name = "KRC Doctor"
uniform = /obj/item/clothing/under/rank/konyang/krc
shoes = /obj/item/clothing/shoes/laceup/brown
@@ -197,7 +197,7 @@
back = /obj/item/storage/backpack/satchel
l_pocket = /obj/item/storage/wallet/random
/datum/outfit/admin/konyang_clinic/get_id_access()
/obj/outfit/admin/konyang_clinic/get_id_access()
return list(ACCESS_KONYANG_VENDORS)
/datum/ghostspawner/human/konyang_pharm
@@ -207,14 +207,14 @@
max_count = 1
tags = list("External")
spawnpoints = list("konyang_pharm")
outfit = /datum/outfit/admin/konyang_pharm
outfit = /obj/outfit/admin/konyang_pharm
possible_species = list(SPECIES_HUMAN, SPECIES_IPC, SPECIES_IPC_BISHOP, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_SHELL, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
assigned_role = "Pharmacist"
special_role = "Pharmacist"
respawn_flag = null
/datum/outfit/admin/konyang_pharm
/obj/outfit/admin/konyang_pharm
name = "Konyang Pharmacist"
uniform = /obj/item/clothing/under/color/white
shoes = /obj/item/clothing/shoes/sneakers/medsci
@@ -222,7 +222,7 @@
l_pocket = /obj/item/storage/wallet/random
id = /obj/item/card/id
/datum/outfit/admin/konyang_pharm/get_id_access()
/obj/outfit/admin/konyang_pharm/get_id_access()
return list(ACCESS_KONYANG_VENDORS)
/datum/ghostspawner/human/konyang_bar
@@ -232,14 +232,14 @@
max_count = 1
tags = list("External")
spawnpoints = list("konyang_bar")
outfit = /datum/outfit/admin/konyang_bar
outfit = /obj/outfit/admin/konyang_bar
possible_species = list(SPECIES_HUMAN, SPECIES_IPC, SPECIES_IPC_BISHOP, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_SHELL, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
assigned_role = "Bartender"
special_role = "Bartender"
respawn_flag = null
/datum/outfit/admin/konyang_bar
/obj/outfit/admin/konyang_bar
name = "Konyang Bartender"
uniform = /obj/item/clothing/under/rank/bartender
shoes = /obj/item/clothing/shoes/sneakers/brown
@@ -247,7 +247,7 @@
back = /obj/item/storage/backpack/satchel
id = /obj/item/card/id
/datum/outfit/admin/konyang_bar/get_id_access()
/obj/outfit/admin/konyang_bar/get_id_access()
return list(ACCESS_KONYANG_VENDORS)
/datum/ghostspawner/human/konyang_utility
@@ -257,14 +257,14 @@
max_count = 2
tags = list("External")
spawnpoints = list("konyang_utility")
outfit = /datum/outfit/admin/konyang_utility
outfit = /obj/outfit/admin/konyang_utility
possible_species = list(SPECIES_HUMAN, SPECIES_IPC, SPECIES_IPC_BISHOP, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_SHELL, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
assigned_role = "Point Verdant Utility Worker"
special_role = "Point Verdant Utility Worker"
respawn_flag = null
/datum/outfit/admin/konyang_utility
/obj/outfit/admin/konyang_utility
name = "Point Verdant Utility Worker"
uniform = /obj/item/clothing/under/color/blue
shoes = /obj/item/clothing/shoes/workboots/dark
@@ -282,14 +282,14 @@
max_count = 2
tags = list("External")
spawnpoints = list("konyang_gwok")
outfit = /datum/outfit/admin/konyang_gwok
outfit = /obj/outfit/admin/konyang_gwok
possible_species = list(SPECIES_HUMAN, SPECIES_IPC, SPECIES_IPC_BISHOP, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_SHELL, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
assigned_role = "UP! Burger Employee"
special_role = "UP! Burger Employee"
respawn_flag = null
/datum/outfit/admin/konyang_gwok
/obj/outfit/admin/konyang_gwok
name = "UP! Burger Employee"
uniform = /obj/item/clothing/under/rank/konyang/burger
shoes = /obj/item/clothing/shoes/workboots/dark
@@ -299,7 +299,7 @@
l_pocket = /obj/item/storage/wallet/random
back = /obj/item/storage/backpack/satchel
/datum/outfit/admin/konyang_gwok/get_id_access()
/obj/outfit/admin/konyang_gwok/get_id_access()
return list(ACCESS_KONYANG_VENDORS)
//Konyang Army Personnel - basically a pseudo-ert for if shit's going down on Point Verdant
@@ -310,7 +310,7 @@
max_count = 3
tags = list("External")
spawnpoints = list("konyang_army")
outfit = /datum/outfit/admin/konyang_army_response
outfit = /obj/outfit/admin/konyang_army_response
possible_species = list(SPECIES_HUMAN, SPECIES_IPC, SPECIES_IPC_BISHOP, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_SHELL, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
assigned_role = "Konyang Army Soldier"
@@ -319,7 +319,7 @@
respawn_flag = null
enabled = FALSE
/datum/outfit/admin/konyang_army_response
/obj/outfit/admin/konyang_army_response
name = "Konyang Army Responder"
uniform = /obj/item/clothing/under/rank/konyang
shoes = /obj/item/clothing/shoes/jackboots
@@ -338,7 +338,7 @@
)
/datum/outfit/admin/konyang_army_response/get_id_access()
/obj/outfit/admin/konyang_army_response/get_id_access()
return list(ACCESS_DISTRESS, ACCESS_KONYANG_POLICE, ACCESS_KONYANG_CORPORATE, ACCESS_KONYANG_POLICE, ACCESS_EXTERNAL_AIRLOCKS)
/datum/ghostspawner/human/konyang_army/medic
@@ -346,12 +346,12 @@
short_name = "konyang_army_medic"
desc = "You are a medical specialist of the Konyang army, deployed to deal with a crisis in Point Verdant."
max_count = 1
outfit = /datum/outfit/admin/konyang_army_response/medic
outfit = /obj/outfit/admin/konyang_army_response/medic
mob_name_prefix = "Spc. "
assigned_role = "Konyang Army Medic"
special_role = "Konyang Army Medic"
/datum/outfit/admin/konyang_army_response/medic
/obj/outfit/admin/konyang_army_response/medic
back = /obj/item/storage/backpack/satchel/med
gloves = /obj/item/clothing/gloves/latex/nitrile
glasses = /obj/item/clothing/glasses/hud/health
@@ -372,12 +372,12 @@
short_name = "konyang_army_mechpilot"
desc = "You are an exosuit specialist of the Konyang army's Mechatronic Corps, deployed to deal with a crisis in Point Verdant."
max_count = 1
outfit = /datum/outfit/admin/konyang_army_response/mechpilot
outfit = /obj/outfit/admin/konyang_army_response/mechpilot
mob_name_prefix = "Spc. "
assigned_role = "Konyang Army Exosuit Pilot"
special_role = "Konyang Army Exosuit Pilot"
/datum/outfit/admin/konyang_army_response/mechpilot
/obj/outfit/admin/konyang_army_response/mechpilot
uniform = /obj/item/clothing/under/rank/konyang/mech_pilot
head = /obj/item/clothing/head/helmet/konyang/pilot
gloves = /obj/item/clothing/gloves/yellow
@@ -390,12 +390,12 @@
spawnpoints = list("konyang_army_lead")
desc = "You are an officer in command of a Konyang army unit deployed to deal with a crisis in Point Verdant."
max_count = 1
outfit = /datum/outfit/admin/konyang_army_response/officer
outfit = /obj/outfit/admin/konyang_army_response/officer
mob_name_prefix = "Lt. "
assigned_role = "Konyang Army Officer"
special_role = "Konyang Army Officer"
/datum/outfit/admin/konyang_army_response/officer
/obj/outfit/admin/konyang_army_response/officer
uniform = /obj/item/clothing/under/rank/konyang/officer
head = /obj/item/clothing/head/konyang/army/officer
@@ -406,7 +406,7 @@
spawnpoints = list("pv_corporate_solutions")
desc = "You are a corporate security agent working for Zeng-Hu Pharmaceuticals, responding to a crisis in Point Verdant in cooperation with Einstein Engines personnel."
max_count = 2
outfit = /datum/outfit/admin/corporate_solutions
outfit = /obj/outfit/admin/corporate_solutions
possible_species = list(SPECIES_HUMAN)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
assigned_role = "Solutions Agent (Zeng)"
@@ -414,7 +414,7 @@
respawn_flag = null
enabled = FALSE
/datum/outfit/admin/corporate_solutions
/obj/outfit/admin/corporate_solutions
uniform = /obj/item/clothing/under/rank/security/zeng
shoes = /obj/item/clothing/shoes/combat
belt = /obj/item/storage/belt/military
@@ -428,17 +428,17 @@
)
back = null
/datum/outfit/admin/corporate_solutions/get_id_access()
/obj/outfit/admin/corporate_solutions/get_id_access()
return list(ACCESS_CENT_SPECOPS, ACCESS_KONYANG_CORPORATE, ACCESS_EXTERNAL_AIRLOCKS)
/datum/ghostspawner/human/corporate_solutions/einstein
name = "Einstein Corporate Solutions Agent"
desc = "You are a corporate security agent working for Einstein, responding to a crisis in Point Verdant in cooperation with Zeng-Hu Pharmaceuticals personnel."
outfit = /datum/outfit/admin/corporate_solutions/einstein
outfit = /obj/outfit/admin/corporate_solutions/einstein
assigned_role = "Solutions Agent (Einstein)"
special_role = "Solutions Agent (Einstein)"
/datum/outfit/admin/corporate_solutions/einstein
/obj/outfit/admin/corporate_solutions/einstein
uniform = /obj/item/clothing/under/rank/security/einstein
id = /obj/item/card/id/einstein
@@ -447,9 +447,9 @@
short_name = "pv_corporate_solutions_med"
desc = "You are a corporate medical agent working for Zeng-Hu Pharmaceuticals, responding to a crisis in Point Verdant in cooperation with Einstein Engines personnel."
max_count = 1
outfit = /datum/outfit/admin/corporate_solutions/medic
outfit = /obj/outfit/admin/corporate_solutions/medic
/datum/outfit/admin/corporate_solutions/medic
/obj/outfit/admin/corporate_solutions/medic
uniform = /obj/item/clothing/under/rank/medical/first_responder/zeng
gloves = /obj/item/clothing/gloves/latex/nitrile
glasses = /obj/item/clothing/glasses/hud/health
@@ -480,9 +480,9 @@
short_name = "pv_corporate_solutions_eng"
desc = "You are a corporate engineering agent working for Einstein Engines, responding to a crisis in Point Verdant in cooperation with Zeng-Hu Pharmaceuticals personnel."
max_count = 1
outfit = /datum/outfit/admin/corporate_solutions/einstein/engineer
outfit = /obj/outfit/admin/corporate_solutions/einstein/engineer
/datum/outfit/admin/corporate_solutions/einstein/engineer
/obj/outfit/admin/corporate_solutions/einstein/engineer
uniform = /obj/item/clothing/under/rank/engineer/einstein
gloves = /obj/item/clothing/gloves/yellow
belt = /obj/item/storage/belt/utility/very_full
maps/away/away_site/pirate_base/pirate_base_ghostroles.dm
+8 -8
View File
@@ -22,7 +22,7 @@
max_count = 4
enabled = FALSE
outfit = /datum/outfit/admin/pirate
outfit = /obj/outfit/admin/pirate
possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_DIONA, SPECIES_DIONA_COEUS)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -31,7 +31,7 @@
respawn_flag = null
/datum/outfit/admin/pirate
/obj/outfit/admin/pirate
name = "Pirate Gang Member"
uniform = /obj/item/clothing/under/syndicate/tracksuit
@@ -52,7 +52,7 @@
SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/jackboots/toeless
)
/datum/outfit/admin/pirate/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/pirate/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(isvaurca(H))
H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/vaurca/filter(H), slot_wear_mask)
@@ -74,7 +74,7 @@
if(isoffworlder(H))
H.equip_or_collect(new /obj/item/storage/pill_bottle/rmt, slot_in_backpack)
/datum/outfit/admin/pirate/get_id_access()
/obj/outfit/admin/pirate/get_id_access()
return list(ACCESS_GENERIC_AWAY_SITE, ACCESS_EXTERNAL_AIRLOCKS)
/datum/ghostspawner/human/pirate/boss
@@ -101,7 +101,7 @@
max_count = 1
enabled = FALSE
outfit = /datum/outfit/admin/pirate
outfit = /obj/outfit/admin/pirate
possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_DIONA, SPECIES_DIONA_COEUS)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -110,7 +110,7 @@
respawn_flag = null
/datum/outfit/admin/pirate
/obj/outfit/admin/pirate
name = "Pirate Gang Boss"
species_shoes = list(
@@ -140,7 +140,7 @@
max_count = 1
enabled = FALSE
outfit = /datum/outfit/admin/pirate_prisoner
outfit = /obj/outfit/admin/pirate_prisoner
possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_DIONA, SPECIES_DIONA_COEUS)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -149,7 +149,7 @@
respawn_flag = null
/datum/outfit/admin/pirate_prisoner
/obj/outfit/admin/pirate_prisoner
name = "Pirate Gang Captive"
uniform = /obj/item/clothing/under/color/brown
maps/away/away_site/romanovich/grand_romanovich_ghostroles.dm
+11 -11
View File
@@ -7,7 +7,7 @@
spawnpoints = list("casino_host")
max_count = 1
outfit = /datum/outfit/admin/grand_romanovich_host
outfit = /obj/outfit/admin/grand_romanovich_host
possible_species = list(SPECIES_TAJARA,SPECIES_TAJARA_MSAI,SPECIES_TAJARA_ZHAN)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -17,7 +17,7 @@
extra_languages = list(LANGUAGE_SIIK_MAAS)
/datum/outfit/admin/grand_romanovich_host
/obj/outfit/admin/grand_romanovich_host
name = "Grand Romanovich Host"
uniform = /obj/item/clothing/under/tajaran/fancy
@@ -30,7 +30,7 @@
backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/storage/wallet/random = 1, /obj/item/storage/bag/money/casino = 1)
/datum/outfit/admin/grand_romanovich_host/get_id_access()
/obj/outfit/admin/grand_romanovich_host/get_id_access()
return list(ACCESS_GENERIC_AWAY_SITE, ACCESS_EXTERNAL_AIRLOCKS)
/datum/ghostspawner/human/grand_romanovich_staff
@@ -42,7 +42,7 @@
spawnpoints = list("casino_staff")
max_count = 4
outfit = /datum/outfit/admin/grand_romanovich_staff
outfit = /obj/outfit/admin/grand_romanovich_staff
possible_species = list(SPECIES_TAJARA,SPECIES_TAJARA_MSAI,SPECIES_TAJARA_ZHAN)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
uses_species_whitelist = FALSE
@@ -51,7 +51,7 @@
special_role = "Grand Romanovich Staff"
respawn_flag = null
/datum/outfit/admin/grand_romanovich_staff
/obj/outfit/admin/grand_romanovich_staff
name = "Grand Romanovich Staff"
uniform = /obj/item/clothing/under/tajaran
@@ -65,7 +65,7 @@
backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/storage/wallet/random = 1, /obj/item/storage/bag/money/casino = 1)
/datum/outfit/admin/grand_romanovich_staff/get_id_access()
/obj/outfit/admin/grand_romanovich_staff/get_id_access()
return list(ACCESS_GENERIC_AWAY_SITE, ACCESS_EXTERNAL_AIRLOCKS)
/datum/ghostspawner/human/grand_romanovich_guard
@@ -77,7 +77,7 @@
spawnpoints = list("casino_guard")
max_count = 4
outfit = /datum/outfit/admin/grand_romanovich_guard
outfit = /obj/outfit/admin/grand_romanovich_guard
possible_species = list(SPECIES_TAJARA,SPECIES_TAJARA_MSAI,SPECIES_TAJARA_ZHAN)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
uses_species_whitelist = FALSE
@@ -86,7 +86,7 @@
special_role = "Grand Romanovich Guard"
respawn_flag = null
/datum/outfit/admin/grand_romanovich_guard
/obj/outfit/admin/grand_romanovich_guard
name = "Grand Romanovich Guard"
uniform = /obj/item/clothing/under/suit_jacket/checkered
@@ -114,7 +114,7 @@
/obj/item/ammo_magazine/mc9mm = 2
)
/datum/outfit/admin/grand_romanovich_guard/get_id_access()
/obj/outfit/admin/grand_romanovich_guard/get_id_access()
return list(ACCESS_GENERIC_AWAY_SITE, ACCESS_EXTERNAL_AIRLOCKS)
/datum/ghostspawner/human/casino_patron
@@ -126,7 +126,7 @@
spawnpoints = list("casino_patron")
max_count = 4
outfit = /datum/outfit/admin/random/casino_patron
outfit = /obj/outfit/admin/random/casino_patron
possible_species = list(SPECIES_HUMAN,SPECIES_HUMAN_OFFWORLD,SPECIES_SKRELL, SPECIES_SKRELL_AXIORI,SPECIES_TAJARA,SPECIES_TAJARA_MSAI,SPECIES_TAJARA_ZHAN,SPECIES_UNATHI,SPECIES_VAURCA_WARRIOR,SPECIES_VAURCA_WORKER)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -134,7 +134,7 @@
special_role = "Grand Romanovich"
respawn_flag = null
/datum/outfit/admin/random/casino_patron
/obj/outfit/admin/random/casino_patron
l_ear = /obj/item/device/radio/headset/ship/common
backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/storage/wallet/random = 1, /obj/item/storage/bag/money/casino = 1)
maps/away/away_site/tajara/mining_jack/mining_jack_ghostroles.dm
+3 -3
View File
@@ -7,7 +7,7 @@
spawnpoints = list("tajara_mining_jack")
max_count = 3
outfit = /datum/outfit/admin/tajara_mining_jack
outfit = /obj/outfit/admin/tajara_mining_jack
possible_species = list(SPECIES_TAJARA,SPECIES_TAJARA_MSAI,SPECIES_TAJARA_ZHAN)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -17,7 +17,7 @@
uses_species_whitelist = FALSE
/datum/outfit/admin/tajara_mining_jack
/obj/outfit/admin/tajara_mining_jack
name = "Mining Jack Miner"
uniform = list(
@@ -48,5 +48,5 @@
backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/storage/wallet/random = 1)
/datum/outfit/admin/tajara_mining_jack/get_id_access()
/obj/outfit/admin/tajara_mining_jack/get_id_access()
return list(ACCESS_GENERIC_AWAY_SITE, ACCESS_EXTERNAL_AIRLOCKS)
maps/away/away_site/tajara/peoples_station/peoples_station_ghostroles.dm
+7 -7
View File
@@ -9,7 +9,7 @@
max_count = 5
uses_species_whitelist = FALSE
outfit = /datum/outfit/admin/peoples_station_crew
outfit = /obj/outfit/admin/peoples_station_crew
possible_species = list(SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -18,7 +18,7 @@
extra_languages = list(LANGUAGE_SIIK_MAAS)
respawn_flag = null
/datum/outfit/admin/peoples_station_crew
/obj/outfit/admin/peoples_station_crew
name = "People's Space Station Crewmember"
id = /obj/item/card/id
@@ -32,7 +32,7 @@
accessory = /obj/item/clothing/accessory/badge/hadii_card
r_pocket = /obj/item/storage/wallet/random
/datum/outfit/admin/peoples_station_crew/get_id_access()
/obj/outfit/admin/peoples_station_crew/get_id_access()
return list(ACCESS_PRA, ACCESS_EXTERNAL_AIRLOCKS)
/datum/ghostspawner/human/peoples_station_crew/captain
@@ -45,14 +45,14 @@
max_count = 1
uses_species_whitelist = TRUE
outfit = /datum/outfit/admin/peoples_station_crew/captain
outfit = /obj/outfit/admin/peoples_station_crew/captain
possible_species = list(SPECIES_TAJARA, SPECIES_TAJARA_MSAI)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
assigned_role = "People's Space Station Captain"
special_role = "People's Space Station Captain"
/datum/outfit/admin/peoples_station_crew/captain
/obj/outfit/admin/peoples_station_crew/captain
name = "People's Space Station Captain"
head = /obj/item/clothing/head/tajaran/orbital_captain
@@ -77,10 +77,10 @@
special_role = "Party Commissar"
uses_species_whitelist = TRUE
outfit = /datum/outfit/admin/peoples_station_crew/commissar
outfit = /obj/outfit/admin/peoples_station_crew/commissar
possible_species = list(SPECIES_TAJARA, SPECIES_TAJARA_MSAI)
/datum/outfit/admin/peoples_station_crew/commissar
/obj/outfit/admin/peoples_station_crew/commissar
name = "Party Commissar"
uniform = /obj/item/clothing/under/tajaran/cosmonaut/commissar
maps/away/away_site/tajara/scrapper/scrapper_ghostroles.dm
+3 -3
View File
@@ -7,7 +7,7 @@
spawnpoints = list("tajaran_scrapper")
max_count = 3
outfit = /datum/outfit/admin/tajaran_scrapper
outfit = /obj/outfit/admin/tajaran_scrapper
possible_species = list(SPECIES_TAJARA,SPECIES_TAJARA_MSAI,SPECIES_TAJARA_ZHAN)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -17,7 +17,7 @@
uses_species_whitelist = FALSE
/datum/outfit/admin/tajaran_scrapper
/obj/outfit/admin/tajaran_scrapper
name = "Scrapper"
uniform = list(
@@ -47,5 +47,5 @@
backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/storage/wallet/random = 1)
/datum/outfit/admin/tajaran_scrapper/get_id_access()
/obj/outfit/admin/tajaran_scrapper/get_id_access()
return list(ACCESS_GENERIC_AWAY_SITE, ACCESS_EXTERNAL_AIRLOCKS)
maps/away/away_site/tajara/taj_safehouse/tajara_safehouse_ghostroles.dm
+4 -4
View File
@@ -7,7 +7,7 @@
spawnpoints = list("tajaran_migrant")
max_count = 4
outfit = /datum/outfit/admin/tajaran_migrant
outfit = /obj/outfit/admin/tajaran_migrant
possible_species = list(SPECIES_TAJARA,SPECIES_TAJARA_MSAI,SPECIES_TAJARA_ZHAN)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -17,7 +17,7 @@
uses_species_whitelist = FALSE
/datum/outfit/admin/tajaran_migrant
/obj/outfit/admin/tajaran_migrant
name = "Tajaran Migrant"
uniform = list(
@@ -57,7 +57,7 @@
spawnpoints = list("tajara_revolutionary_army_agent")
max_count = 2
outfit = /datum/outfit/admin/tajara_revolutionary_army_agent
outfit = /obj/outfit/admin/tajara_revolutionary_army_agent
possible_species = list(SPECIES_TAJARA,SPECIES_TAJARA_MSAI,SPECIES_TAJARA_ZHAN)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -65,7 +65,7 @@
special_role = "Tajara Revolutionary Army Agent"
respawn_flag = null
/datum/outfit/admin/tajara_revolutionary_army_agent
/obj/outfit/admin/tajara_revolutionary_army_agent
name = "Tajara Revolutionary Army Agent"
uniform = list(
maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_ghostroles.dm
+8 -8
View File
@@ -8,7 +8,7 @@
spawnpoints = list("tcaf_crewman")
max_count = 3
outfit = /datum/outfit/admin/tcaf_crewman
outfit = /obj/outfit/admin/tcaf_crewman
possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_DIONA, SPECIES_DIONA_COEUS)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -16,7 +16,7 @@
special_role = "Republican Fleet Legionary"
respawn_flag = null
/datum/outfit/admin/tcaf_crewman
/obj/outfit/admin/tcaf_crewman
name = "TCAF Crewman"
uniform = /obj/item/clothing/under/legion/tcaf
gloves = /obj/item/clothing/gloves/tcaf
@@ -35,7 +35,7 @@
SPECIES_VAURCA_WARRIOR =/obj/item/clothing/shoes/vaurca
)
/datum/outfit/admin/tcaf_crewman/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/tcaf_crewman/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(isvaurca(H))
H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/vaurca/filter(H), slot_wear_mask)
@@ -58,20 +58,20 @@
if(isoffworlder(H))
H.equip_or_collect(new /obj/item/storage/pill_bottle/rmt, slot_in_backpack)
/datum/outfit/admin/tcaf_crewman/get_id_access()
/obj/outfit/admin/tcaf_crewman/get_id_access()
return list(ACCESS_TCAF_SHIPS, ACCESS_EXTERNAL_AIRLOCKS)
/datum/ghostspawner/human/tcaf_crewman/nco
name = "Republican Fleet Prefect"
short_name = "tcaf_nco"
max_count = 1
outfit = /datum/outfit/admin/tcaf_crewman/nco
outfit = /obj/outfit/admin/tcaf_crewman/nco
mob_name_prefix = "Pfct. "
desc = "Serve as the second-in-command of the Republican Fleet patrol vessel. Aid your commanding officer in their duties, clear the sector of any pirate activity, and uphold the interests of the Republic of Biesel."
assigned_role = "Republican Fleet Prefect"
special_role = "Republican Fleet Prefect"
/datum/outfit/admin/tcaf_crewman/nco
/obj/outfit/admin/tcaf_crewman/nco
accessory = /obj/item/clothing/accessory/legion
backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/melee/energy/sword/knife = 1, /obj/item/clothing/accessory/tcaf_prefect_pauldron = 1)
@@ -80,11 +80,11 @@
short_name = "tcaf_officer"
max_count = 1
spawnpoints = list("tcaf_officer")
outfit = /datum/outfit/admin/tcaf_crewman/officer
outfit = /obj/outfit/admin/tcaf_crewman/officer
mob_name_prefix = "Dcn. "
desc = "Command a patrol vessel of the Tau Ceti Republican Fleet. Sweep the sector for signs of piracy, uphold the interests of the Republic of Biesel, and try to keep your crew in one piece."
assigned_role = "Republican Fleet Decurion"
special_role = "Republican Fleet Decurion"
/datum/outfit/admin/tcaf_crewman/officer
/obj/outfit/admin/tcaf_crewman/officer
accessory = /obj/item/clothing/accessory/legion
maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship_ghostroles.dm
+8 -8
View File
@@ -10,7 +10,7 @@
spawnpoints = list("tcfl_peacekeeper")
max_count = 3
outfit = /datum/outfit/admin/tcfl_peacekeeper
outfit = /obj/outfit/admin/tcfl_peacekeeper
possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_DIONA, SPECIES_DIONA_COEUS)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -19,7 +19,7 @@
respawn_flag = null
/datum/outfit/admin/tcfl_peacekeeper
/obj/outfit/admin/tcfl_peacekeeper
name = "TCFL Peacekeeper"
head = /obj/item/clothing/head/beret/legion/field
@@ -42,7 +42,7 @@
SPECIES_VAURCA_WARRIOR =/obj/item/clothing/shoes/jackboots/toeless
)
/datum/outfit/admin/tcfl_peacekeeper/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/tcfl_peacekeeper/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(isvaurca(H))
H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/vaurca/filter(H), slot_wear_mask)
@@ -53,7 +53,7 @@
if(isoffworlder(H))
H.equip_or_collect(new /obj/item/storage/pill_bottle/rmt, slot_in_backpack)
/datum/outfit/admin/tcfl_peacekeeper/get_id_access()
/obj/outfit/admin/tcfl_peacekeeper/get_id_access()
return list(ACCESS_TCAF_SHIPS, ACCESS_EXTERNAL_AIRLOCKS)
/datum/ghostspawner/human/tcfl_peacekeeper/prefect
@@ -65,13 +65,13 @@
spawnpoints = list("tcfl_peacekeeper_prefect")
max_count = 1
outfit = /datum/outfit/admin/tcfl_peacekeeper/prefect
outfit = /obj/outfit/admin/tcfl_peacekeeper/prefect
assigned_role = "TCFL Peacekeeper Prefect"
special_role = "TCFL Peacekeeper Prefect"
/datum/outfit/admin/tcfl_peacekeeper/prefect
/obj/outfit/admin/tcfl_peacekeeper/prefect
name = "TCFL Peacekeeper Prefect"
accessory = /obj/item/clothing/accessory/legion
@@ -84,13 +84,13 @@
max_count = 1
outfit = /datum/outfit/admin/tcfl_peacekeeper/pilot
outfit = /obj/outfit/admin/tcfl_peacekeeper/pilot
assigned_role = "TCFL Peacekeeper Pilot"
special_role = "TCFL Peacekeeper Pilot"
/datum/outfit/admin/tcfl_peacekeeper/pilot
/obj/outfit/admin/tcfl_peacekeeper/pilot
name = "TCFL Peacekeeper Pilot"
uniform = /obj/item/clothing/under/legion/pilot
maps/away/ships/coc/coc_ranger/coc_ship_ghostroles.dm
+6 -6
View File
@@ -9,7 +9,7 @@
spawnpoints = list("ranger")
max_count = 5
outfit = /datum/outfit/admin/ranger
outfit = /obj/outfit/admin/ranger
possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -19,7 +19,7 @@
respawn_flag = null
/datum/outfit/admin/ranger
/obj/outfit/admin/ranger
name = "Coalition Ranger"
uniform = /obj/item/clothing/under/tactical
@@ -32,12 +32,12 @@
backpack_contents = list(/obj/item/storage/box/survival = 1)
/datum/outfit/admin/ranger/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/obj/outfit/admin/ranger/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(isoffworlder(H))
H.equip_or_collect(new /obj/item/storage/pill_bottle/rmt, slot_in_backpack)
/datum/outfit/admin/ranger/get_id_access()
/obj/outfit/admin/ranger/get_id_access()
return list(ACCESS_EXTERNAL_AIRLOCKS)
/datum/ghostspawner/human/ranger/captain
@@ -48,7 +48,7 @@
spawnpoints = list("ranger_leader")
max_count = 1
outfit = /datum/outfit/admin/ranger/captain
outfit = /obj/outfit/admin/ranger/captain
possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -56,7 +56,7 @@
special_role = "Frontier Ranger Leader"
/datum/outfit/admin/ranger/captain
/obj/outfit/admin/ranger/captain
name = "Coalition Ranger Leader"
accessory = /obj/item/clothing/accessory/sash/red
maps/away/ships/coc/coc_scarab/coc_scarab_ghostroles.dm
+5 -5
View File
@@ -8,7 +8,7 @@
max_count = 4
respawn_flag = null
outfit = /datum/outfit/admin/scarab
outfit = /obj/outfit/admin/scarab
possible_species = list(SPECIES_HUMAN_OFFWORLD)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -19,7 +19,7 @@
culture_restriction = list(/singleton/origin_item/culture/coalition)
/datum/outfit/admin/scarab
/obj/outfit/admin/scarab
name = "Scarab Salvager"
uniform = /obj/item/clothing/under/offworlder/drab
mask = /obj/item/clothing/mask/offworlder/drab
@@ -33,11 +33,11 @@
belt = /obj/item/storage/belt/utility/full
backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/storage/pill_bottle/rmt = 1, /obj/item/clothing/accessory/offworlder/drab = 1, /obj/item/clothing/accessory/offworlder/bracer/drab = 1, /obj/item/clothing/accessory/offworlder/bracer/neckbrace/drab = 1, )
/datum/outfit/admin/scarab/captain
/obj/outfit/admin/scarab/captain
name = "Scarab Salvager Captain"
accessory = /obj/item/clothing/accessory/sash/purple
/datum/outfit/admin/scarab/get_id_access()
/obj/outfit/admin/scarab/get_id_access()
return list(ACCESS_EXTERNAL_AIRLOCKS)
/datum/ghostspawner/human/coc_scarab/captain
@@ -48,4 +48,4 @@
special_role = "Scarab Salvager Captain"
desc = "Command a salvage ship sent to gather resources for the Scarab Fleet - mine precious minerals, salvage derelict ships, siphon valuable gasses from exoplanets, and care for your crew as your family. Remember, the fleet is always in need of more resources, and you need to make your expedition worth it. (OOC Note: Characters must have names and backgrounds consistent with the Scarab Fleet. This is enforceable by admin action.)"
welcome_message = "You are the captain of a small but tightly-knit salvage vessel sent out by the Scarab Fleet, a nomadic group of offworlder humans in the Coalition of Colonies, to retrieve critical resources for the wider fleet. You inherited your role by familial affilation, and your crew looks up to you for leadership and courage. Your people live on the edge of a knife, carefully managing the resources available to them to survive in the hostile void of space, and working tirelessly to make their next day easier than their last. Do everything necessary to survive, for yourself, for your crew, and for your fleet."
outfit = /datum/outfit/admin/scarab/captain
outfit = /obj/outfit/admin/scarab/captain
maps/away/ships/coc/coc_surveyor/coc_surveyor_ghostroles.dm
+4 -4
View File
@@ -9,7 +9,7 @@
max_count = 4
uses_species_whitelist = TRUE
respawn_flag = null
outfit = /datum/outfit/admin/coc_surveyor_crew
outfit = /obj/outfit/admin/coc_surveyor_crew
possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_IPC, SPECIES_IPC_BISHOP, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_SHELL, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
@@ -18,7 +18,7 @@
special_role = "Coalition Surveyor"
respawn_flag = null
/datum/outfit/admin/coc_surveyor_crew
/obj/outfit/admin/coc_surveyor_crew
name = "Coalition Surveyor"
uniform = /obj/item/clothing/under/tactical
@@ -36,14 +36,14 @@
SPECIES_TAJARA_ZHAN = /obj/item/clothing/shoes/workboots/toeless/dark
)
/datum/outfit/admin/coc_surveyor_crew/post_equip(mob/living/carbon/human/H)
/obj/outfit/admin/coc_surveyor_crew/post_equip(mob/living/carbon/human/H)
if(!istype(H))
return
if(istajara(H))
H.equip_to_slot_or_del(new /obj/item/voidsuit_modkit/himeo/tajara, slot_r_hand)
/datum/outfit/admin/coc_surveyor_crew/get_id_access()
/obj/outfit/admin/coc_surveyor_crew/get_id_access()
return list(ACCESS_EXTERNAL_AIRLOCKS, ACCESS_GENERIC_AWAY_SITE)
/datum/ghostspawner/human/coc_surveyor/captain

Some files were not shown because too many files have changed in this diff Show More