cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-23 13:18:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-11990

Browse Source
This commit is contained in:
Nadyr
2021-12-12 06:36:50 -05:00
committed by GitHub
parent 7592dd99d4 6a0aeb8819
commit a18f0f082a
270 changed files with 37518 additions and 34824 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/antagonism/02_candidacy.dm
+2
View File
@@ -21,6 +21,8 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
"lost drone" = 1, // 16
"maint pred" = 1, // 17
"morph" = 1, // 18
"corgi" = 1, // 19
"cursed sword" = 1, // 20
//VOREStation Add End
)
code/modules/client/preference_setup/loadout/loadout_accessories.dm
+7 -7
View File
@@ -138,32 +138,32 @@
/datum/gear/accessory/brown_vest
display_name = "webbing, brown"
path = /obj/item/clothing/accessory/storage/brown_vest
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/black_vest
display_name = "webbing, black"
path = /obj/item/clothing/accessory/storage/black_vest
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/white_vest
display_name = "webbing, white"
path = /obj/item/clothing/accessory/storage/white_vest
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/brown_drop_pouches
display_name = "drop pouches, brown"
path = /obj/item/clothing/accessory/storage/brown_drop_pouches
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/black_drop_pouches
display_name = "drop pouches, black"
path = /obj/item/clothing/accessory/storage/black_drop_pouches
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/white_drop_pouches
display_name = "drop pouches, white"
path = /obj/item/clothing/accessory/storage/white_drop_pouches
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/fannypack
display_name = "fannypack selection"
@@ -306,4 +306,4 @@
"Brown Vest" = /obj/item/clothing/accessory/cowboy_vest/brown,
"Grey Vest" = /obj/item/clothing/accessory/cowboy_vest/grey
)
gear_tweaks += new/datum/gear_tweak/path(cowboy_vests)
gear_tweaks += new/datum/gear_tweak/path(cowboy_vests)
code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
+5 -5
View File
@@ -58,11 +58,11 @@
/datum/gear/accessory/brown_vest
display_name = "webbing, brown (Eng, Sec, Med, Exploration, Miner)"
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard","Security Pilot") //YW ADDITIONS
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/black_vest
display_name = "webbing, black (Eng, Sec, Med, Exploration, Miner)"
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard","Security Pilot") //YW ADDITIONS
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/white_vest
display_name = "webbing, white (Medical)"
@@ -70,11 +70,11 @@
/datum/gear/accessory/brown_drop_pouches
display_name = "drop pouches, brown (Eng, Sec, Med, Exploration, Miner)"
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard","Security Pilot") //YW ADDITIONS
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/black_drop_pouches
display_name = "drop pouches, black (Eng, Sec, Med, Exploration, Miner)"
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard","Security Pilot") //YW ADDITIONS
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/white_drop_pouches
display_name = "drop pouches, white (Medical)"
@@ -83,7 +83,7 @@
/datum/gear/accessory/bluespace
display_name = "bluespace badge (Eng, Sec, Med, Exploration, Miner)"
path = /obj/item/clothing/accessory/storage/bluespace
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner")
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner")
cost = 2
/datum/gear/accessory/webbing
code/modules/client/preference_setup/loadout/loadout_eyes.dm
+1 -1
View File
@@ -104,7 +104,7 @@
/datum/gear/eyes/meson
display_name = "Optical Meson Scanners (Engineering, Science, Mining)"
path = /obj/item/clothing/glasses/meson
allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Shaft Miner")
allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Shaft Miner")
/datum/gear/eyes/meson/prescription
display_name = "Optical Meson Scanners, prescription (Engineering, Science, Mining)"
code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm
+2 -2
View File
@@ -3,7 +3,7 @@
/datum/gear/eyes/meson
display_name = "Optical Meson Scanners (Eng, Sci, Explo)"
allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Explorer", "Pathfinder")
allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Explorer", "Pathfinder")
/datum/gear/eyes/arglasses
display_name = "AR glasses"
@@ -33,7 +33,7 @@
/datum/gear/eyes/arglasses/eng
display_name = "AR-E glasses (Eng)"
path = /obj/item/clothing/glasses/omnihud/eng
allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician")
allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician")
/datum/gear/eyes/arglasses/med
display_name = "AR-M glasses (Medical)"
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+21 -8
View File
@@ -16,7 +16,7 @@
display_name = "Airhorn - Example Item"
description = "An example item that you probably shouldn't see!"
ckeywhitelist = list("mewchild")
allowed_roles = list("Station Engineer")
allowed_roles = list("Engineer")
*/
@@ -234,6 +234,12 @@
ckeywhitelist = list("chaleur")
character_name = list("Hisako Arato")
/datum/gear/fluff/jade_stamp
path = /obj/item/weapon/stamp/fluff/jade_horror
display_name = "Official Council of Mid Horror rubber stamp"
ckeywhitelist = list("coolcrow420")
character_name = list("Jade Davis")
// D CKEYS
/datum/gear/fluff/dhaeleena_medal
path = /obj/item/clothing/accessory/medal/silver/security/fluff/dhael
@@ -320,6 +326,7 @@
// G CKEYS
// H CKEYS
/datum/gear/fluff/lauren_medal
path = /obj/item/clothing/accessory/medal/conduct
display_name = "Lauren's Medal"
@@ -753,11 +760,17 @@
ckeywhitelist = list("pastelprincedan")
character_name = list("Kiyoshi Maki", "Masumi Maki")
/datum/gear/fluff/masumi_overalls
path = /obj/item/clothing/under/fluff/masumi_overalls
display_name = "white and blue overalls"
ckeywhitelist = list("pastelprincedan")
character_name = list("Masumi Maki")
/datum/gear/fluff/mechanic_overalls
path = /obj/item/clothing/under/fluff/mechanic_overalls
display_name = "mechanic overalls"
ckeywhitelist = list("pastelprincedan", "hatterhat")
character_name = list("Masumi Maki", "Harold Robinson")
/datum/gear/fluff/mechanic_coat
path = /obj/item/clothing/suit/storage/hooded/wintercoat/fluff/mechanic
display_name = "mechanic winter coat"
ckeywhitelist = list("pastelprincedan", "hatterhat")
character_name = list("Masumi Maki", "Harold Robinson")
// Q CKEYS
@@ -818,14 +831,14 @@
display_name = "Kateryna's Voidsuit"
ckeywhitelist = list("samanthafyre")
character_name = list("Kateryna Petrovitch")
allowed_roles = list("Station Engineer", "Chief Engineer", "Atmospheric Technician")
allowed_roles = list("Engineer", "Chief Engineer", "Atmospheric Technician")
/datum/gear/fluff/katerina_spacesuit
path = /obj/item/clothing/head/helmet/space/fluff/kate
display_name = "Kateryna's Helmet"
ckeywhitelist = list("samanthafyre")
character_name = list("Kateryna Petrovitch")
allowed_roles = list("Station Engineer", "Chief Engineer", "Atmospheric Technician")
allowed_roles = list("Engineer", "Chief Engineer", "Atmospheric Technician")
/datum/gear/fluff/kateryna_armorvest
path = /obj/item/clothing/suit/armor/vest/wolftaur/kate
code/modules/client/preference_setup/loadout/loadout_head.dm
+1 -1
View File
@@ -349,7 +349,7 @@
display_name = "welding, normal (engineering/robotics)"
path = /obj/item/clothing/head/welding
cost = 2
allowed_roles = list("Chief Engineer","Station Engineer","Atmospheric Technician","Research Director","Roboticist")
allowed_roles = list("Chief Engineer","Engineer","Atmospheric Technician","Research Director","Roboticist")
/datum/gear/head/welding/demon
display_name = "welding, demon (engineering/robotics)"
code/modules/client/preference_setup/loadout/loadout_mask.dm
+3 -3
View File
@@ -46,13 +46,13 @@
/datum/gear/mask/gaiter
display_name = "neck gaiter selection"
path = /obj/item/clothing/mask/gaiter
path = /obj/item/clothing/accessory/gaiter
cost = 1
/datum/gear/mask/gaiter/New()
..()
var/list/gaiters = list()
for(var/gaiter in typesof(/obj/item/clothing/mask/gaiter))
var/obj/item/clothing/mask/gaiter_type = gaiter
for(var/gaiter in typesof(/obj/item/clothing/accessory/gaiter))
var/obj/item/clothing/accessory/gaiter_type = gaiter
gaiters[initial(gaiter_type.name)] = gaiter_type
gear_tweaks += new/datum/gear_tweak/path(sortTim(gaiters, /proc/cmp_text_asc))
code/modules/client/preference_setup/loadout/loadout_suit.dm
+2 -2
View File
@@ -424,7 +424,7 @@
/datum/gear/suit/wintercoat/engineering
display_name = "winter coat, engineering"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/engineering
allowed_roles = list("Chief Engineer","Atmospheric Technician", "Station Engineer")
allowed_roles = list("Chief Engineer","Atmospheric Technician", "Engineer")
/datum/gear/suit/wintercoat/engineering/atmos
display_name = "winter coat, atmospherics"
@@ -599,7 +599,7 @@
/datum/gear/suit/snowsuit/engineering
display_name = "snowsuit, engineering"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/engineering
allowed_roles = list("Chief Engineer","Atmospheric Technician", "Station Engineer")
allowed_roles = list("Chief Engineer","Atmospheric Technician", "Engineer")
/datum/gear/suit/snowsuit/cargo
display_name = "snowsuit, supply"
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+2 -2
View File
@@ -119,7 +119,7 @@
/datum/gear/uniform/job_skirt/eng
display_name = "skirt, engineer"
path = /obj/item/clothing/under/rank/engineer/skirt
allowed_roles = list("Chief Engineer","Station Engineer")
allowed_roles = list("Chief Engineer","Engineer")
/datum/gear/uniform/job_skirt/roboticist
display_name = "skirt, roboticist"
@@ -189,7 +189,7 @@
/datum/gear/uniform/job_turtle/engineering
display_name = "turtleneck, engineering"
path = /obj/item/clothing/under/rank/engineer/turtleneck
allowed_roles = list("Chief Engineer", "Atmospheric Technician", "Station Engineer")
allowed_roles = list("Chief Engineer", "Atmospheric Technician", "Engineer")
/datum/gear/uniform/job_turtle/medical
display_name = "turtleneck, medical"
code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
+8 -10
View File
@@ -37,7 +37,7 @@
/datum/gear/uniform/job_khi/eng
display_name = "ge uniform, eng" //CHOMPedit: changed to GE suit
path = /obj/item/clothing/under/rank/khi/eng
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer")
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer")
/datum/gear/uniform/job_khi/sci
display_name = "ge uniform, sci" //CHOMPedit: changed to GE suit
@@ -67,7 +67,7 @@
/datum/gear/suit/job_fed/eng
display_name = "fed uniform, eng"
path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedeng
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer")
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer")
// Trekie things
//TOS
@@ -84,11 +84,10 @@
/datum/gear/uniform/job_trek/eng/tos
display_name = "TOS uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
path = /obj/item/clothing/under/rank/trek/eng //CHOMPEdit: Engineering only
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
//CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
//TNG
/datum/gear/uniform/job_trek/cmd/tng
display_name = "TNG uniform, cmd"
@@ -103,7 +102,7 @@
/datum/gear/uniform/job_trek/eng/tng
display_name = "TNG uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
path = /obj/item/clothing/under/rank/trek/eng/next //CHOMPEdit: Engineering only
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
//CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
@@ -121,11 +120,10 @@
/datum/gear/uniform/job_trek/eng/voy
display_name = "VOY uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
path = /obj/item/clothing/under/rank/trek/eng/voy //CHOMPEdit: Engineering only
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
//CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
//DS9
/datum/gear/suit/job_trek/ds9_coat
@@ -134,7 +132,7 @@
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director",
"Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist",
"Scientist","Roboticist","Xenobiologist","Xenobotanist","Atmospheric Technician",
"Station Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic", "Blueshield Guard","Security Pilot") //YW ADDITIONS
"Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic", "Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/uniform/job_trek/cmd/ds9
@@ -150,7 +148,7 @@
/datum/gear/uniform/job_trek/eng/ds9
display_name = "DS9 uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
path = /obj/item/clothing/under/rank/trek/eng/ds9 //CHOMPEdit: Engineering only
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
//CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
@@ -168,7 +166,7 @@
/datum/gear/uniform/job_trek/eng/ent
display_name = "ENT uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
path = /obj/item/clothing/under/rank/trek/eng/ent //CHOMPEdit: Engineering only
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
//CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
+1 -1
View File
@@ -49,7 +49,7 @@
/datum/gear/utility/dufflebag/eng
display_name = "engineering dufflebag"
path = /obj/item/weapon/storage/backpack/dufflebag/eng
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer")
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer")
/datum/gear/utility/dufflebag/sci
display_name = "science dufflebag"
code/modules/client/preference_setup/loadout/loadout_xeno.dm
+2 -2
View File
@@ -224,7 +224,7 @@
/datum/gear/uniform/dept/undercoat/engineer
display_name = "engineering undercoat (Teshari)"
path = /obj/item/clothing/under/teshari/undercoat/jobs/engineer
allowed_roles = list("Chief Engineer","Station Engineer")
allowed_roles = list("Chief Engineer","Engineer")
/datum/gear/uniform/dept/undercoat/atmos
display_name = "atmospherics undercoat (Teshari)"
@@ -397,7 +397,7 @@
/datum/gear/suit/dept/cloak/engineer
display_name = "engineering cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/engineer
allowed_roles = list("Chief Engineer","Station Engineer")
allowed_roles = list("Chief Engineer","Engineer")
/datum/gear/suit/dept/cloak/engineer/New()
..()
code/modules/client/preference_setup/vore/07_traits.dm
+8 -1
View File
@@ -75,6 +75,13 @@
pref.starting_trait_points = STARTING_SPECIES_POINTS
pref.max_traits = MAX_SPECIES_TRAITS
if(pref.organ_data[O_BRAIN]) //Checking if we have a synth on our hands, boys.
pref.dirty_synth = 1
pref.gross_meatbag = 0
else
pref.gross_meatbag = 1
pref.dirty_synth = 0
if(pref.species != SPECIES_CUSTOM)
pref.pos_traits.Cut()
pref.neg_traits.Cut()
@@ -105,7 +112,7 @@
var/take_flags = initial(path.can_take)
if((pref.dirty_synth && !(take_flags & SYNTHETICS)) || (pref.gross_meatbag && !(take_flags & ORGANICS)))
pref.neg_traits -= path
var/datum/species/selected_species = GLOB.all_species[pref.species]
if(selected_species.selects_bodytype)
// Allowed!