cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Back to /rank/

Browse Source
This commit is contained in:
SinTwo
2016-05-18 15:08:18 -04:00
parent 64df53f568
commit 3ed17ad1ec
6 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
View File

@@ -17,7 +17,7 @@
if(prob(25))
new /obj/item/weapon/storage/backpack/dufflebag(src)
new /obj/item/clothing/under/rank/cargotech(src)
new /obj/item/clothing/under/skirt/job/cargotech(src)
new /obj/item/clothing/under/rank/cargotech/skirt(src)
new /obj/item/clothing/under/rank/cargotech/jeans(src)
new /obj/item/clothing/under/rank/cargotech/jeans/female(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/cargo(src)
@@ -48,7 +48,7 @@
if(prob(25))
new /obj/item/weapon/storage/backpack/dufflebag(src)
new /obj/item/clothing/under/rank/cargo(src)
new /obj/item/clothing/under/skirt/job/cargo(src)
new /obj/item/clothing/under/rank/cargo/skirt(src)
new /obj/item/clothing/under/rank/cargo/jeans(src)
new /obj/item/clothing/under/rank/cargo/jeans/female(src)
new /obj/item/clothing/shoes/brown(src)

2
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
View File

@@ -20,7 +20,7 @@
new /obj/item/clothing/accessory/storage/brown_vest(src)
new /obj/item/blueprints(src)
new /obj/item/clothing/under/rank/chief_engineer(src)
new /obj/item/clothing/under/skirt/job/engineer/chief_engineer(src)
new /obj/item/clothing/under/rank/engineer/chief_engineer/skirt(src)
new /obj/item/clothing/head/hardhat/white(src)
new /obj/item/clothing/head/welding(src)
new /obj/item/clothing/gloves/yellow(src)

2
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
View File

@@ -192,7 +192,7 @@
new /obj/item/clothing/under/rank/medical/navyblue(src)
new /obj/item/clothing/head/surgery/navyblue(src)
new /obj/item/clothing/under/rank/chief_medical_officer(src)
new /obj/item/clothing/under/skirt/job/medical/chief_medical_officer(src)
new /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/cmo(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt(src)
new /obj/item/weapon/cartridge/cmo(src)

32
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
View File

@@ -246,9 +246,9 @@
new /obj/item/clothing/under/rank/atmospheric_technician(src)
new /obj/item/clothing/under/rank/atmospheric_technician(src)
new /obj/item/clothing/under/rank/atmospheric_technician(src)
new /obj/item/clothing/under/skirt/job/engineer/atmospheric_technician(src)
new /obj/item/clothing/under/skirt/job/engineer/atmospheric_technician(src)
new /obj/item/clothing/under/skirt/job/engineer/atmospheric_technician(src)
new /obj/item/clothing/under/rank/engineer/atmospheric_technician/skirt(src)
new /obj/item/clothing/under/rank/engineer/atmospheric_technician/skirt(src)
new /obj/item/clothing/under/rank/engineer/atmospheric_technician/skirt(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
@@ -276,9 +276,9 @@
new /obj/item/clothing/under/rank/engineer(src)
new /obj/item/clothing/under/rank/engineer(src)
new /obj/item/clothing/under/rank/engineer(src)
new /obj/item/clothing/under/skirt/job/engineer(src)
new /obj/item/clothing/under/skirt/job/engineer(src)
new /obj/item/clothing/under/skirt/job/engineer(src)
new /obj/item/clothing/under/rank/engineer/skirt(src)
new /obj/item/clothing/under/rank/engineer/skirt(src)
new /obj/item/clothing/under/rank/engineer/skirt(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/shoes/orange(src)
@@ -347,8 +347,8 @@
new /obj/item/clothing/under/rank/scientist(src)
new /obj/item/clothing/under/rank/scientist(src)
new /obj/item/clothing/under/rank/scientist(src)
new /obj/item/clothing/under/skirt/job/scientist(src)
new /obj/item/clothing/under/skirt/job/scientist(src)
new /obj/item/clothing/under/rank/scientist/skirt(src)
new /obj/item/clothing/under/rank/scientist/skirt(src)
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
@@ -396,8 +396,8 @@
..()
new /obj/item/clothing/under/rank/chemist(src)
new /obj/item/clothing/under/rank/chemist(src)
new /obj/item/clothing/under/skirt/job/medical/chemist(src)
new /obj/item/clothing/under/skirt/job/medical/chemist(src)
new /obj/item/clothing/under/rank/medical/chemist/skirt(src)
new /obj/item/clothing/under/rank/medical/chemist/skirt(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/chemist(src)
@@ -418,8 +418,8 @@
..()
new /obj/item/clothing/under/rank/geneticist(src)
new /obj/item/clothing/under/rank/geneticist(src)
new /obj/item/clothing/under/skirt/job/medical/geneticist(src)
new /obj/item/clothing/under/skirt/job/medical/geneticist(src)
new /obj/item/clothing/under/rank/medical/geneticist/skirt(src)
new /obj/item/clothing/under/rank/medical/geneticist/skirt(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/genetics(src)
@@ -440,8 +440,8 @@
..()
new /obj/item/clothing/under/rank/virologist(src)
new /obj/item/clothing/under/rank/virologist(src)
new /obj/item/clothing/under/skirt/job/medical/virologist(src)
new /obj/item/clothing/under/skirt/job/medical/virologist(src)
new /obj/item/clothing/under/rank/medical/virologist/skirt(src)
new /obj/item/clothing/under/rank/medical/virologist/skirt(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/virologist(src)
@@ -464,8 +464,8 @@
..()
new /obj/item/clothing/under/rank/medical(src)
new /obj/item/clothing/under/rank/medical(src)
new /obj/item/clothing/under/skirt/job/medical(src)
new /obj/item/clothing/under/skirt/job/medical(src)
new /obj/item/clothing/under/rank/medical/skirt(src)
new /obj/item/clothing/under/rank/medical/skirt(src)
new /obj/item/clothing/under/rank/medical/blue(src)
new /obj/item/clothing/under/rank/medical/green(src)
new /obj/item/clothing/under/rank/medical/purple(src)

30
code/modules/client/preference_setup/loadout/loadout_uniform.dm
View File

@@ -59,7 +59,7 @@
/datum/gear/uniform/skirt/New()
..()
var/list/skirts = list()
for(var/skirt in (typesof(/obj/item/clothing/under/skirt) - typesof(/obj/item/clothing/under/skirt/job)))
for(var/skirt in (typesof(/obj/item/clothing/under/skirt)))
var/obj/item/clothing/under/skirt/skirt_type = skirt
skirts[initial(skirt_type.name)] = skirt_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(skirts))
@@ -90,72 +90,72 @@
/datum/gear/uniform/skirt/ce
display_name = "skirt, ce"
path = /obj/item/clothing/under/skirt/job/engineer/chief_engineer
path = /obj/item/clothing/under/rank/engineer/chief_engineer/skirt
allowed_roles = list("Chief Engineer")
/datum/gear/uniform/skirt/atmos
display_name = "skirt, atmos"
path = /obj/item/clothing/under/skirt/job/engineer/atmospheric_technician
path = /obj/item/clothing/under/rank/engineer/atmospheric_technician/skirt
allowed_roles = list("Chief Engineer","Atmospheric Technician")
/datum/gear/uniform/skirt/eng
display_name = "skirt, engineer"
path = /obj/item/clothing/under/skirt/job/engineer
path = /obj/item/clothing/under/rank/engineer/skirt
allowed_roles = list("Chief Engineer","Station Engineer")
/datum/gear/uniform/skirt/roboticist
display_name = "skirt, roboticist"
path = /obj/item/clothing/under/skirt/job/roboticist
path = /obj/item/clothing/under/rank/roboticist/skirt
allowed_roles = list("Research Director","Roboticist")
/datum/gear/uniform/skirt/cmo
display_name = "skirt, cmo"
path = /obj/item/clothing/under/skirt/job/medical/chief_medical_officer
path = /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt
allowed_roles = list("Chief Medical Officer")
/datum/gear/uniform/skirt/chem
display_name = "skirt, chemist"
path = /obj/item/clothing/under/skirt/job/medical/chemist
path = /obj/item/clothing/under/rank/medical/chemist/skirt
allowed_roles = list("Chief Medical Officer","Chemist")
/datum/gear/uniform/skirt/viro
display_name = "skirt, virologist"
path = /obj/item/clothing/under/skirt/job/medical/virologist
path = /obj/item/clothing/under/rank/medical/virologist/skirt
allowed_roles = list("Chief Medical Officer","Medical Doctor")
/datum/gear/uniform/skirt/med
display_name = "skirt, medical"
path = /obj/item/clothing/under/skirt/job/medical
path = /obj/item/clothing/under/rank/medical/skirt
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic")
/datum/gear/uniform/skirt/sci
display_name = "skirt, scientist"
path = /obj/item/clothing/under/skirt/job/scientist
path = /obj/item/clothing/under/rank/scientist/skirt
allowed_roles = list("Research Director","Scientist")
/datum/gear/uniform/skirt/cargo
display_name = "skirt, cargo"
path = /obj/item/clothing/under/skirt/job/cargotech
path = /obj/item/clothing/under/rank/cargotech/skirt
allowed_roles = list("Quartermaster","Cargo Technician")
/datum/gear/uniform/skirt/qm
display_name = "skirt, QM"
path = /obj/item/clothing/under/skirt/job/cargo
path = /obj/item/clothing/under/rank/cargo/skirt
allowed_roles = list("Quartermaster")
/datum/gear/uniform/skirt/warden
display_name = "skirt, warden"
path = /obj/item/clothing/under/skirt/job/security/warden
path = /obj/item/clothing/under/rank/security/warden/skirt
allowed_roles = list("Head of Security", "Warden")
/datum/gear/uniform/skirt/security
display_name = "skirt, security"
path = /obj/item/clothing/under/skirt/job/security
path = /obj/item/clothing/under/rank/security/skirt
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
/datum/gear/uniform/skirt/head_of_security
display_name = "skirt, hos"
path = /obj/item/clothing/under/skirt/job/security/head_of_security
path = /obj/item/clothing/under/rank/security/head_of_security/skirt
allowed_roles = list("Head of Security")
/datum/gear/uniform/jeans_qm

30
code/modules/clothing/under/shorts.dm
View File

@@ -157,77 +157,77 @@
item_state = "kilt"
worn_state = "plaid_purple"
/obj/item/clothing/under/skirt/job/cargo
/obj/item/clothing/under/rank/cargo/skirt
name = "quartermaster's jumpskirt"
desc = "It's a jumpskirt worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
icon_state = "qmf"
worn_state = "qmf"
/obj/item/clothing/under/skirt/job/cargotech
/obj/item/clothing/under/rank/cargotech/skirt
name = "cargo technician's jumpskirt"
desc = "Skirrrrrts! They're comfy and easy to wear!"
icon_state = "cargof"
worn_state = "cargof"
/obj/item/clothing/under/skirt/job/engineer
/obj/item/clothing/under/rank/engineer/skirt
desc = "It's an orange high visibility jumpskirt worn by engineers. It has minor radiation shielding."
name = "engineer's jumpskirt"
icon_state = "enginef"
worn_state = "enginef"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
/obj/item/clothing/under/skirt/job/engineer/chief_engineer
/obj/item/clothing/under/rank/engineer/chief_engineer/skirt
desc = "It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding."
name = "chief engineer's jumpskirt"
icon_state = "chieff"
worn_state = "chieff"
/obj/item/clothing/under/skirt/job/engineer/atmospheric_technician
/obj/item/clothing/under/rank/engineer/atmospheric_technician/skirt
desc = "It's a jumpskirt worn by atmospheric technicians."
name = "atmospheric technician's jumpskirt"
icon_state = "atmosf"
worn_state = "atmosf"
/obj/item/clothing/under/skirt/job/roboticist
/obj/item/clothing/under/rank/roboticist/skirt
desc = "It's a slimming black jumpskirt with reinforced seams; great for industrial work."
name = "roboticist's jumpskirt"
icon_state = "roboticsf"
worn_state = "roboticsf"
/obj/item/clothing/under/skirt/job/scientist
/obj/item/clothing/under/rank/scientist/skirt
name = "scientist's jumpskirt"
icon_state = "sciencewhitef"
worn_state = "sciencewhitef"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
/obj/item/clothing/under/skirt/job/medical
/obj/item/clothing/under/rank/medical/skirt
name = "medical doctor's jumpskirt"
icon_state = "medicalf"
worn_state = "medicalf"
/obj/item/clothing/under/skirt/job/medical/chemist
/obj/item/clothing/under/rank/medical/chemist/skirt
name = "chemist's jumpskirt"
icon_state = "chemistrywhitef"
worn_state = "chemistrywhitef"
/obj/item/clothing/under/skirt/job/medical/chief_medical_officer
/obj/item/clothing/under/rank/medical/chief_medical_officer/skirt
desc = "It's a jumpskirt worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
name = "chief medical officer's jumpskirt"
icon_state = "cmof"
worn_state = "cmof"
/obj/item/clothing/under/skirt/job/medical/geneticist
/obj/item/clothing/under/rank/medical/geneticist/skirt
name = "geneticist's jumpskirt"
icon_state = "geneticswhitef"
worn_state = "geneticswhitef"
/obj/item/clothing/under/skirt/job/medical/virologist
/obj/item/clothing/under/rank/medical/virologist/skirt
name = "virologist's jumpskirt"
icon_state = "virologywhitef"
worn_state = "virologywhitef"
/obj/item/clothing/under/skirt/job/security
/obj/item/clothing/under/rank/security/skirt
name = "security officer's jumpskirt"
desc = "Standard feminine fashion for Security Officers. It's made of sturdier material than the standard jumpskirts."
icon_state = "secredf"
@@ -236,14 +236,14 @@
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
/obj/item/clothing/under/skirt/job/security/warden
/obj/item/clothing/under/rank/security/warden/skirt
desc = "Standard feminine fashion for a Warden. It is made of sturdier material than standard jumpskirts. It has the word \"Warden\" written on the shoulders."
name = "warden's jumpskirt"
icon_state = "wardenf"
item_state = "r_suit"
worn_state = "wardenf"
/obj/item/clothing/under/skirt/job/security/head_of_security
/obj/item/clothing/under/rank/security/head_of_security/skirt
desc = "It's a fashionable jumpskirt worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer."
name = "head of security's jumpskirt"
icon_state = "hosredf"