yey, working and in the loadout, though it fucks with the formatting
This commit is contained in:
Poojawa
@@ -1,82 +1,82 @@
|
||||
// Trekie things
|
||||
//TOS
|
||||
/datum/gear/uniform/job_trek/cmd/tos
|
||||
display_name = "TOS uniform, cmd"
|
||||
name = "TOS uniform, cmd"
|
||||
category = slot_w_uniform
|
||||
path = /obj/item/clothing/under/rank/trek/command
|
||||
restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
|
||||
|
||||
/datum/gear/uniform/job_trek/medsci/tos
|
||||
display_name = "TOS uniform, med/sci"
|
||||
name = "TOS uniform, med/sci"
|
||||
category = slot_w_uniform
|
||||
path = /obj/item/clothing/under/rank/trek/medsci
|
||||
restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
|
||||
|
||||
/datum/gear/uniform/job_trek/eng/tos
|
||||
display_name = "TOS uniform, ops/sec"
|
||||
name = "TOS uniform, ops/sec"
|
||||
category = slot_w_uniform
|
||||
path = /obj/item/clothing/under/rank/trek/engsec
|
||||
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
|
||||
|
||||
//Federation jackets from movies
|
||||
/datum/gear/uniform/job_trek/cmd/cap
|
||||
display_name = "fed (movie) uniform, Captain"
|
||||
name = "fed (movie) uniform, Captain"
|
||||
category = slot_wear_suit
|
||||
path = /obj/item/clothing/suit/storage/fluff/fedcoat/capt
|
||||
restricted_roles = list("Captain","Head of Personnel")
|
||||
|
||||
/datum/gear/uniform/job_trek/cmd/mov
|
||||
display_name = "fed (movie) uniform, sec"
|
||||
name = "fed (movie) uniform, sec"
|
||||
category = slot_wear_suit
|
||||
path = /obj/item/clothing/suit/storage/fluff/fedcoat
|
||||
restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster","Warden","Detective","Security Officer")
|
||||
|
||||
/datum/gear/suit/job_trek/medsci/mov
|
||||
display_name = "fed (movie) uniform, med/sci"
|
||||
name = "fed (movie) uniform, med/sci"
|
||||
category = slot_wear_suit
|
||||
path = /obj/item/clothing/suit/storage/fluff/fedcoat/medsci
|
||||
restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
|
||||
|
||||
/datum/gear/suit/job_trek/eng/mov
|
||||
display_name = "fed (movie) uniform, ops/eng"
|
||||
name = "fed (movie) uniform, ops/eng"
|
||||
category = slot_wear_suit
|
||||
path = /obj/item/clothing/suit/storage/fluff/fedcoat/eng
|
||||
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Cargo Technician", "Shaft Miner", "Quartermaster")
|
||||
|
||||
|
||||
//TNG
|
||||
/datum/gear/uniform/job_trek/cmd/tng
|
||||
display_name = "TNG uniform, cmd"
|
||||
name = "TNG uniform, cmd"
|
||||
category = slot_w_uniform
|
||||
path = /obj/item/clothing/under/rank/trek/command/next
|
||||
restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
|
||||
|
||||
/datum/gear/uniform/job_trek/medsci/tng
|
||||
display_name = "TNG uniform, med/sci"
|
||||
name = "TNG uniform, med/sci"
|
||||
category = slot_w_uniform
|
||||
path = /obj/item/clothing/under/rank/trek/medsci/next
|
||||
restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
|
||||
|
||||
/datum/gear/uniform/job_trek/eng/tng
|
||||
display_name = "TNG uniform, ops/sec"
|
||||
name = "TNG uniform, ops/sec"
|
||||
category = slot_w_uniform
|
||||
path = /obj/item/clothing/under/rank/trek/engsec/next
|
||||
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
|
||||
|
||||
//VOY
|
||||
/datum/gear/uniform/job_trek/cmd/voy
|
||||
display_name = "VOY uniform, cmd"
|
||||
name = "VOY uniform, cmd"
|
||||
category = slot_w_uniform
|
||||
path = /obj/item/clothing/under/rank/trek/command/voy
|
||||
restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
|
||||
|
||||
/datum/gear/uniform/job_trek/medsci/voy
|
||||
display_name = "VOY uniform, med/sci"
|
||||
name = "VOY uniform, med/sci"
|
||||
category = slot_w_uniform
|
||||
path = /obj/item/clothing/under/rank/trek/medsci/voy
|
||||
restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
|
||||
|
||||
/datum/gear/uniform/job_trek/eng/voy
|
||||
display_name = "VOY uniform, ops/sec"
|
||||
name = "VOY uniform, ops/sec"
|
||||
category = slot_w_uniform
|
||||
path = /obj/item/clothing/under/rank/trek/engsec/voy
|
||||
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
|
||||
@@ -84,28 +84,28 @@
|
||||
//DS9
|
||||
|
||||
/datum/gear/suit/job_trek/ds9_coat
|
||||
display_name = "DS9 Overcoat (use uniform)"
|
||||
name = "DS9 Overcoat (use uniform)"
|
||||
category = slot_wear_suit
|
||||
path = /obj/item/clothing/suit/storage/trek/ds9
|
||||
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"
|
||||
"Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer",
|
||||
"Cargo Technician", "Shaft Miner") //everyone who actually deserves a job.
|
||||
|
||||
/datum/gear/uniform/job_trek/cmd/ds9
|
||||
display_name = "DS9 uniform, cmd"
|
||||
name = "DS9 uniform, cmd"
|
||||
category = slot_w_uniform
|
||||
path = /obj/item/clothing/under/rank/trek/command/ds9
|
||||
restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
|
||||
|
||||
/datum/gear/uniform/job_trek/medsci/ds9
|
||||
display_name = "DS9 uniform, med/sci"
|
||||
name = "DS9 uniform, med/sci"
|
||||
category = slot_w_uniform
|
||||
path = /obj/item/clothing/under/rank/trek/medsci/ds9
|
||||
restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
|
||||
|
||||
/datum/gear/uniform/job_trek/eng/ds9
|
||||
display_name = "DS9 uniform, ops/sec"
|
||||
name = "DS9 uniform, ops/sec"
|
||||
category = slot_w_uniform
|
||||
path = /obj/item/clothing/under/rank/trek/engsec/ds9
|
||||
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
|
||||
@@ -113,19 +113,19 @@
|
||||
|
||||
//ENT
|
||||
/datum/gear/uniform/job_trek/cmd/ent
|
||||
display_name = "ENT uniform, cmd"
|
||||
name = "ENT uniform, cmd"
|
||||
category = slot_w_uniform
|
||||
path = /obj/item/clothing/under/rank/trek/command/ent
|
||||
restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
|
||||
|
||||
/datum/gear/uniform/job_trek/medsci/ent
|
||||
display_name = "ENT uniform, med/sci"
|
||||
name = "ENT uniform, med/sci"
|
||||
category = slot_w_uniform
|
||||
path = /obj/item/clothing/under/rank/trek/medsci/ent
|
||||
restricted_roles = list(("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
|
||||
restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
|
||||
|
||||
/datum/gear/uniform/job_trek/eng/ent
|
||||
display_name = "ENT uniform, ops/sec"
|
||||
name = "ENT uniform, ops/sec"
|
||||
category = slot_w_uniform
|
||||
path = /obj/item/clothing/under/rank/trek/engsec/ent
|
||||
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
|
||||
@@ -141,14 +141,14 @@
|
||||
name = "Federation Officer's Cap"
|
||||
category = slot_head
|
||||
path = /obj/item/clothing/head/caphat/formal/fedcover/medsci
|
||||
restricted_roles = list(("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
|
||||
|
||||
restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
|
||||
|
||||
/datum/gear/hat/job_trek/cap/eng
|
||||
name = "Federation Officer's Cap"
|
||||
category = slot_head
|
||||
path = /obj/item/clothing/head/caphat/formal/fedcover/eng
|
||||
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
|
||||
|
||||
|
||||
/datum/gear/hat/job_trek/cap/sec
|
||||
name = "Federation Officer's Cap"
|
||||
category = slot_head
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
name = "Section 31 Uniform"
|
||||
desc = "Oooh... right."
|
||||
icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi'
|
||||
alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
|
||||
icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
|
||||
item_state = ""
|
||||
can_adjust = FALSE //to prevent you from "wearing it casually"
|
||||
|
||||
@@ -93,25 +93,25 @@
|
||||
name = "Padded Overcoat"
|
||||
desc = "The overcoat worn by all officers of the 2380s."
|
||||
icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi'
|
||||
alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
|
||||
icon_state = "trek_ds9_coat"
|
||||
item_state = "trek_ds9_coat_mob"
|
||||
icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
|
||||
item_state = "trek_ds9_coat"
|
||||
body_parts_covered = CHEST|GROIN|ARMS
|
||||
permeability_coefficient = 0.50
|
||||
allowed = list(
|
||||
/obj/item/device/flashlight, /obj/item/device/analyzer,
|
||||
/obj/item/device/radio, /obj/item/weapon/tank/emergency/oxygen,
|
||||
/obj/item/device/radio, /obj/item/tank/internals/emergency_oxygen,
|
||||
/obj/item/reagent_containers/hypospray, /obj/item/device/healthanalyzer,/obj/item/reagent_containers/syringe,
|
||||
/obj/item/reagent_containers/glass/bottle/vial,/obj/item/reagent_containers/glass/beaker,
|
||||
/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle
|
||||
/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle, /obj/item/restraints/handcuffs
|
||||
)
|
||||
armor = list("melee" = 20, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 5, "bio" = 5, "rad" = 10, "fire" = 10, "acid" = 0)
|
||||
armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 5, "bio" = 5, "rad" = 10, "fire" = 10, "acid" = 0)
|
||||
|
||||
/obj/item/clothing/suit/storage/trek/ds9/admiral // Only for adminuz
|
||||
name = "Admiral Overcoat"
|
||||
desc = "Admirality specialty coat to keep flag officers fashionable and protected."
|
||||
icon_state = "trek_ds9_coat_adm"
|
||||
item_state = "trek_ds9_coat_adm_mob"
|
||||
item_state = "trek_ds9_coat_adm"
|
||||
permeability_coefficient = 0.01
|
||||
armor = list("melee" = 50, "bullet" = 50, "laser" = 50,"energy" = 50, "bomb" = 50, "bio" = 50, "rad" = 50, "fire" = 50, "acid" = 50)
|
||||
|
||||
@@ -138,28 +138,28 @@
|
||||
desc = "A uniform jacket from the United Federation. Starfleet still uses this uniform and there are variations of it. Set phasers to awesome."
|
||||
|
||||
icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi'
|
||||
alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
|
||||
icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
|
||||
icon_state = "fedcoat"
|
||||
item_state = "fedcoat"
|
||||
|
||||
blood_overlay_type = "coat"
|
||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
|
||||
body_parts_covered = CHEST|GROIN|ARMS
|
||||
allowed = list(
|
||||
/obj/item/tank/emergency/oxygen,
|
||||
/obj/item/tank/internals/emergency_oxygen,
|
||||
/obj/item/device/flashlight,
|
||||
/obj/item/device/analyzer,
|
||||
/obj/item/device/radio,
|
||||
/obj/item/gun,
|
||||
/obj/item/melee/baton,
|
||||
/obj/item/handcuffs,
|
||||
/obj/item/restraints/handcuffs,
|
||||
/obj/item/reagent_containers/hypospray,
|
||||
/obj/item/device/healthanalyzer,
|
||||
/obj/item/reagent_containers/syringe,
|
||||
/obj/item/reagent_containers/glass/bottle/vial,
|
||||
/obj/item/reagent_containers/glass/beaker,
|
||||
/obj/item/storage/pill_bottle
|
||||
/obj/item/storage/pill_bottle,
|
||||
/obj/item/device/taperecorder)
|
||||
armor = list("melee" = 20, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 5, "bio" = 5, "rad" = 10, "fire" = 10, "acid" = 0)
|
||||
armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 5, "bio" = 5, "rad" = 10, "fire" = 10, "acid" = 0)
|
||||
var/unbuttoned = 0
|
||||
|
||||
verb/toggle()
|
||||
@@ -205,16 +205,16 @@
|
||||
name = "Modern Federation Uniform Jacket"
|
||||
desc = "A modern uniform jacket from the United Federation. Their Starfleet had recently started using these uniforms. Wearing this makes you feel like a competant commander."
|
||||
icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi'
|
||||
alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
|
||||
icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
|
||||
icon_state = "fedmodern"
|
||||
item_state = "fedmodern"
|
||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
|
||||
body_parts_covered = CHEST|GROIN|ARMS
|
||||
allowed = list(
|
||||
/obj/item/tank/emergency/oxygen,
|
||||
/obj/item/tank/internals/emergency_oxygen,
|
||||
/obj/item/device/flashlight,
|
||||
/obj/item/gun,
|
||||
/obj/item/melee/baton,
|
||||
/obj/item/handcuffs,
|
||||
/obj/item/restraints/handcuffs,
|
||||
/obj/item/device/taperecorder)
|
||||
armor = list("melee" = 45, "bullet" = 25, "laser" = 25,"energy" = 25, "bomb" = 25, "bio" = 25, "rad" = 50, "fire" = 50, "acid" = 50)
|
||||
|
||||
@@ -238,8 +238,8 @@
|
||||
name = "Federation Officer's Cap"
|
||||
desc = "An officer's cap that demands discipline from the one who wears it."
|
||||
icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi'
|
||||
alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
|
||||
icon_state = "fedcapofficer"
|
||||
icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
|
||||
item_state = "fedcapofficer_mob"
|
||||
armor = list("melee" = 10, "bullet" = 10, "laser" = 10,"energy" = 10, "bomb" = 0, "bio" = 10, "rad" = 10, "fire" = 0, "acid" = 0)
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 8.8 KiB After Width: | Height: | Size: 8.8 KiB |
@@ -2655,10 +2655,12 @@
|
||||
#include "modular_citadel\code\modules\client\loadout\shoes.dm"
|
||||
#include "modular_citadel\code\modules\client\loadout\suit.dm"
|
||||
#include "modular_citadel\code\modules\client\loadout\uniform.dm"
|
||||
#include "modular_citadel\code\modules\client\loadout\uniform_trek.dm"
|
||||
#include "modular_citadel\code\modules\client\verbs\who.dm"
|
||||
#include "modular_citadel\code\modules\clothing\spacesuits\flightsuit.dm"
|
||||
#include "modular_citadel\code\modules\clothing\suits\suits.dm"
|
||||
#include "modular_citadel\code\modules\clothing\under\polychromic_clothes.dm"
|
||||
#include "modular_citadel\code\modules\clothing\under\trek_under.dm"
|
||||
#include "modular_citadel\code\modules\clothing\under\turtlenecks.dm"
|
||||
#include "modular_citadel\code\modules\clothing\under\under.dm"
|
||||
#include "modular_citadel\code\modules\crafting\recipes.dm"
|
||||
|
||||
Reference in New Issue
Block a user