shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KHAAAAAAAAAAN!!

Browse Source 
Adds TMP enlist, trainee and service uniforms.
Also fixes inaccurate restricted description for existing trek loadout.
This commit is contained in:
Anonymous
2020-04-17 10:53:43 +03:00
parent ab9c04ceb9
commit d61c0dc155
5 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/under/trek.dm
+16
View File
@@ -96,6 +96,22 @@
icon_state = "trek_ds9_medsci"
item_state = "trek_ds9_medsci"
//The Motion Picture
/obj/item/clothing/under/trek/fedutil
name = "federation utility uniform"
desc = "The uniform worn by United Federation enlisted crew members in 2285s."
icon_state = "trek_tmp_enlist"
item_state = "r_suit"
/obj/item/clothing/under/trek/fedutil/trainee
name = "federation trainee utility uniform"
desc = "The uniform worn by United Federation enlisted trainees in 2285s."
icon_state = "trek_tmp_trainee"
/obj/item/clothing/under/trek/fedutil/service
name = "federation service uniform"
desc = "The uniform worn by United Federation enlists for service work in 2285s."
icon_state = "trek_tmp_service"
//Q
/obj/item/clothing/under/trek/Q
icons/mob/clothing/uniform.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 394 KiB

After

Width:  |  Height:  |  Size: 396 KiB

icons/mob/clothing/uniform_digi.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 336 KiB

After

Width:  |  Height:  |  Size: 339 KiB

icons/obj/clothing/uniforms.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 111 KiB

modular_citadel/code/modules/client/loadout/uniform.dm
+29 -5
View File
@@ -292,7 +292,7 @@
name = "TOS uniform, ops/sec"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/trek/engsec
restricted_desc = "Engineering and Security"
restricted_desc = "Engineering, Security, and Cargo"
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
//TNG
@@ -314,7 +314,7 @@
name = "TNG uniform, ops/sec"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/trek/engsec/next
restricted_desc = "Engineering and Security"
restricted_desc = "Engineering, Security, and Cargo"
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
//VOY
@@ -336,7 +336,7 @@
name = "VOY uniform, ops/sec"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/trek/engsec/voy
restricted_desc = "Engineering and Security"
restricted_desc = "Engineering, Security, and Cargo"
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
//DS9
@@ -358,7 +358,7 @@
name = "DS9 uniform, ops/sec"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/trek/engsec/ds9
restricted_desc = "Engineering and Security"
restricted_desc = "Engineering, Security, and Cargo"
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
//ENT
@@ -380,9 +380,33 @@
name = "ENT uniform, ops/sec"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/trek/engsec/ent
restricted_desc = "Engineering and Security"
restricted_desc = "Engineering, Security, and Cargo"
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
//TheMotionPicture
/datum/gear/trekfedutil
name = "TMP uniform"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/trek/fedutil
restricted_desc = "All, barring Service and Civilian"
restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster",
"Medical Doctor","Chemist","Virologist","Geneticist","Scientist", "Roboticist",
"Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer",
"Cargo Technician", "Shaft Miner")
/datum/gear/trekfedtrainee
name = "TMP uniform, trainee"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/trek/fedutil/trainee
restricted_roles = list("Assistant", "Janitor", "Cargo Technician")
/datum/gear/trekfedservice
name = "TMP uniform, service"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/trek/fedutil/service
restricted_desc = "Service and Civilian, barring Clown, Mime and Lawyer"
restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor")
//Memes
/datum/gear/gear_harnesses
name = "Gear Harness"