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

modular_citadel

Browse Source
This commit is contained in:
LetterJay
2018-05-20 23:04:13 -05:00
parent a0b6b4e7d8
commit 1e207a7430
26 changed files with 282 additions and 848 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/client/loadout/__donator.dm
+47 -47
View File
@@ -2,279 +2,279 @@
/datum/gear/pingcoderfailsafe
name = "IF YOU SEE THIS, PING A CODER RIGHT NOW!"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/bikehorn/golden
ckeywhitelist = list("This entry should never appear with this variable set.") //If it does, then that means somebody fucked up the whitelist system pretty hard
/datum/gear/donortestingbikehorn
name = "Donor item testing bikehorn"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/bikehorn
geargroupID = "DONORTEST"
/datum/gear/kevhorn
name = "Airhorn"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/bikehorn/airhorn
ckeywhitelist = list("kevinz000")
/datum/gear/cebusoap
name = "Cebutris' soap"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/custom/ceb_soap
ckeywhitelist = list("cebutris")
/datum/gear/kiaracloak
name = "Kiara's cloak"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/cloak/inferno
ckeywhitelist = list("inferno707")
/datum/gear/kiaracollar
name = "Kiara's collar"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/petcollar/inferno
ckeywhitelist = list("inferno707")
/datum/gear/kiaramedal
name = "Insignia of Steele"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/clothing/accessory/medal/steele
ckeywhitelist = list("inferno707")
/datum/gear/sexymimemask
name = "The hollow heart"
category = slot_wear_mask
category = SLOT_WEAR_MASK
path = /obj/item/clothing/mask/sexymime
ckeywhitelist = list("inferno707")
/datum/gear/engravedzippo
name = "Engraved zippo"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/lighter/gold
ckeywhitelist = list("dirtyoldharry")
/datum/gear/geisha
name = "Geisha suit"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/geisha
ckeywhitelist = list("atiefling")
/datum/gear/specialscarf
name = "Special scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/scarf/zomb
ckeywhitelist = list("zombierobin")
/datum/gear/redmadcoat
name = "The Mad's labcoat"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/toggle/labcoat/mad/red
ckeywhitelist = list("zombierobin")
/datum/gear/santahat
name = "Santa hat"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/santa/fluff
ckeywhitelist = list("illotafv")
/datum/gear/reindeerhat
name = "Reindeer hat"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/hardhat/reindeer/fluff
ckeywhitelist = list("illotafv")
/datum/gear/treeplushie
name = "Christmas tree plushie"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/plush/tree
ckeywhitelist = list("illotafv")
/datum/gear/santaoutfit
name = "Santa costume"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/space/santa/fluff
ckeywhitelist = list("illotafv")
/datum/gear/treecloak
name = "Christmas tree cloak"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/cloak/festive
ckeywhitelist = list("illotafv")
/datum/gear/carrotplush
name = "Carrot plushie"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/plush/carrot
ckeywhitelist = list("improvedname")
/datum/gear/carrotcloak
name = "Carrot cloak"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/cloak/carrot
ckeywhitelist = list("improvedname")
/datum/gear/albortorosamask
name = "Alborto Rosa mask"
category = slot_wear_mask
category = SLOT_WEAR_MASK
path = /obj/item/clothing/mask/luchador/zigfie
ckeywhitelist = list("zigfie")
/datum/gear/mankini
name = "Mankini"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/mankini
ckeywhitelist = list("zigfie")
/datum/gear/pinkshoes
name = "Pink shoes"
category = slot_shoes
category = SLOT_SHOES
path = /obj/item/clothing/shoes/sneakers/pink
ckeywhitelist = list("zigfie")
/datum/gear/reecesgreatcoat
name = "Reece's Great Coat"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/trenchcoat/green
ckeywhitelist = list("geemiesif")
/datum/gear/russianflask
name = "Russian flask"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/reagent_containers/food/drinks/flask/russian
cost = 2
ckeywhitelist = list("slomka")
/datum/gear/stalkermask
name = "S.T.A.L.K.E.R. mask"
category = slot_wear_mask
category = SLOT_WEAR_MASK
path = /obj/item/clothing/mask/gas/stalker
ckeywhitelist = list("slomka")
/datum/gear/stripedcollar
name = "Striped collar"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/petcollar/stripe
ckeywhitelist = list("jademanique")
/datum/gear/performersoutfit
name = "Bluish performer's outfit"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/singery/custom
ckeywhitelist = list("killer402402")
/datum/gear/vermillion
name = "Vermillion clothing"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/suit/vermillion
ckeywhitelist = list("fractious")
/datum/gear/AM4B
name = "Foam Force AM4-B"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/gun/ballistic/automatic/AM4B
ckeywhitelist = list("zeronetalpha")
/datum/gear/carrotsatchel
name = "Carrot Satchel"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/storage/backpack/satchel/carrot
ckeywhitelist = list("improvedname")
/datum/gear/naomisweater
name = "worn black sweater"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/bb_sweater/black/naomi
ckeywhitelist = list("technicalmagi")
/datum/gear/naomicollar
name = "worn pet collar"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/petcollar/naomi
ckeywhitelist = list("technicalmagi")
/datum/gear/gladiator
name = "Gladiator Armor"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/under/gladiator
ckeywhitelist = list("aroche")
/datum/gear/bloodredtie
name = "Blood Red Tie"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/tie/bloodred
ckeywhitelist = list("kyutness")
/datum/gear/puffydress
name = "Puffy Dress"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/puffydress
ckeywhitelist = list("stallingratt")
/datum/gear/labredblack
name = "Black and Red Coat"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/toggle/labcoat/labredblack
ckeywhitelist = list("blakeryan", "durandalphor")
/datum/gear/torisword
name = "Rainbow Zweihander"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/twohanded/hypereutactic/toy/rainbow
ckeywhitelist = list("annoymous35")
/datum/gear/darksabre
name = "Dark Sabre"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/sword/darksabre
ckeywhitelist = list("inferno707")
datum/gear/darksabresheath
name = "Dark Sabre Sheath"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/storage/belt/sabre/darksabre
ckeywhitelist = list("inferno707")
/datum/gear/toriball
name = "Rainbow Tennis Ball"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/tennis/rainbow
ckeywhitelist = list("annoymous35")
/datum/gear/izzyball
name = "Katlin's Ball"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/tennis/rainbow/izzy
ckeywhitelist = list("izzyinbox")
/datum/gear/cloak
name = "Green Cloak"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/cloak/green
ckeywhitelist = list("killer402402")
/datum/gear/steelflask
name = "Steel Flask"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/reagent_containers/food/drinks/flask/steel
cost = 2
ckeywhitelist = list("johnnyvitrano")
/datum/gear/paperhat
name = "Paper Hat"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/paperhat
ckeywhitelist = list("kered2")
/datum/gear/cloakce
name = "Polychromic CE Cloak"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/clothing/neck/cloak/polychromic/polyce
ckeywhitelist = list("worksbythesea", "blakeryan")
/datum/gear/ssk
name = "Stun Sword Kit"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/ssword_kit
ckeywhitelist = list("phillip458")
modular_citadel/code/modules/client/loadout/_medical.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/datum/gear/stethoscope
name = "Stethoscope"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/stethoscope
restricted_roles = list("Medical Doctor", "Chief Medical Officer")
modular_citadel/code/modules/client/loadout/_security.dm
+12 -12
View File
@@ -1,71 +1,71 @@
/datum/gear/navyblueuniformhos
name = "Head of Security navyblue uniform"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/head_of_security/navyblue
restricted_roles = list("Head of Security")
/datum/gear/navybluehosberet
name = "Head of security's Naviblue beret"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/beret/sec/navyhos
restricted_roles = list("Head of Security")
/datum/gear/navybluejackethos
name = "head of security's navyblue jacket"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/security/hos
restricted_roles = list("Head of Security")
/datum/gear/navybluejacketofficer
name = "security officer's navyblue jacket"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/security/officer
restricted_roles = list("Security Officer")
/datum/gear/navyblueofficerberet
name = "Security officer's Navyblue beret"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/beret/sec/navyofficer
restricted_roles = list("Security Officer")
/datum/gear/navyblueuniformofficer
name = "security officer navyblue uniform"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/security/navyblue
restricted_roles = list("Security officer")
/datum/gear/navybluejacketwarden
name = "warden navyblue jacket"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/security/warden
restricted_roles = list("Warden")
/datum/gear/navybluewardenberet
name = "Warden's navyblue beret"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/beret/sec/navywarden
restricted_roles = list("Warden")
/datum/gear/navyblueuniformwarden
name = "Warden navyblue uniform"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/warden/navyblue
restricted_roles = list("Warden")
/datum/gear/secskirt
name = "Security skirt"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/security/skirt
restricted_roles = list("Security Officer", "Warden", "Head of Security")
/datum/gear/hosskirt
name = "Head of security's skirt"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/head_of_security/skirt
restricted_roles = list("Head of Security")
/datum/gear/sechud
name = "Security Hud"
category = slot_glasses
category = SLOT_GLASSES
path = /obj/item/clothing/glasses/hud/security
restricted_roles = list("Security Officer", "Warden", "Head of Security")
modular_citadel/code/modules/client/loadout/_service.dm
+2 -2
View File
@@ -1,13 +1,13 @@
/datum/gear/plushvar
name = "Ratvar Plushie"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/plush/plushvar
cost = 5
restricted_roles = list("Chaplain")
/datum/gear/narplush
name = "Narsie Plushie"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/plush/narplush
cost = 5
restricted_roles = list("Chaplain")
modular_citadel/code/modules/client/loadout/backpack.dm
+12 -12
View File
@@ -1,59 +1,59 @@
/datum/gear/plushcarp
name = "Space carp plushie"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/plush/carpplushie
/datum/gear/plushliz
name = "Lizard plushie"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/plush/lizardplushie
/datum/gear/plushsnek
name = "Snake plushie"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/plush/snakeplushie
/datum/gear/plushslime
name = "Slime plushie"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/plush/slimeplushie
/datum/gear/tennis
name = "Classic Tennis Ball"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/tennis
/datum/gear/tennisred
name = "Red Tennis Ball"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/tennis/red
/datum/gear/tennisyellow
name = "Yellow Tennis Ball"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/tennis/yellow
/datum/gear/tennisgreen
name = "Green Tennis Ball"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/tennis/green
/datum/gear/tenniscyan
name = "Cyan Tennis Ball"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/tennis/cyan
/datum/gear/tennisblue
name = "Blue Tennis Ball"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/tennis/blue
/datum/gear/tennispurple
name = "Purple Tennis Ball"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/tennis/purple
/datum/gear/dildo
name = "Customizable dildo"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/dildo/custom
modular_citadel/code/modules/client/loadout/glasses.dm
+9 -9
View File
@@ -1,44 +1,44 @@
/datum/gear/cold
name = "Cold goggles"
category = slot_glasses
category = SLOT_GLASSES
path = /obj/item/clothing/glasses/cold
/datum/gear/eyepatch
name = "Eyepatch"
category = slot_glasses
category = SLOT_GLASSES
path = /obj/item/clothing/glasses/eyepatch
/datum/gear/heat
name = "Heat goggles"
category = slot_glasses
category = SLOT_GLASSES
path = /obj/item/clothing/glasses/heat
/datum/gear/hipster
name = "Hipster glasses"
category = slot_glasses
category = SLOT_GLASSES
path = /obj/item/clothing/glasses/regular/hipster
/datum/gear/jamjar
name = "Jamjar glasses"
category = slot_glasses
category = SLOT_GLASSES
path = /obj/item/clothing/glasses/regular/jamjar
/datum/gear/monocle
name = "Monocle"
category = slot_glasses
category = SLOT_GLASSES
path = /obj/item/clothing/glasses/monocle
/datum/gear/orange
name = "Orange glasses"
category = slot_glasses
category = SLOT_GLASSES
path = /obj/item/clothing/glasses/orange
/datum/gear/red
name = "Red Glasses"
category = slot_glasses
category = SLOT_GLASSES
path = /obj/item/clothing/glasses/red
/datum/gear/prescription
name = "Prescription glasses"
category = slot_glasses
category = SLOT_GLASSES
path = /obj/item/clothing/glasses/regular
modular_citadel/code/modules/client/loadout/gloves.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/datum/gear/fingerless
name = "Fingerless Gloves"
category = slot_gloves
category = SLOT_GLOVES
path = /obj/item/clothing/gloves/fingerless
modular_citadel/code/modules/client/loadout/hands.dm
+13 -13
View File
@@ -1,67 +1,67 @@
/datum/gear/cane
name = "Cane"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/cane
/datum/gear/cigarettes
name = "Cigarette pack"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/storage/fancy/cigarettes
/datum/gear/dice
name = "Dice bag"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/storage/pill_bottle/dice
/datum/gear/eightball
name = "Magic eightball"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/toy/eightball
/datum/gear/matches
name = "Matchbox"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/storage/box/matches
/datum/gear/cheaplighter
name = "Cheap lighter"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/lighter/greyscale
/datum/gear/cards
name = "Playing cards"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/toy/cards/deck
/datum/gear/skub
name = "Skub"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/skub
/datum/gear/carpplushie
name = "Space carp plushie"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/toy/plush/carpplushie
/datum/gear/wallet
name = "Wallet"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/storage/wallet
/datum/gear/flask
name = "Flask"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/reagent_containers/food/drinks/flask
cost = 2
/datum/gear/zippolighter
name = "Zippo Lighter"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/lighter
cost = 2
/datum/gear/cigar
name = "Cigar"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/clothing/mask/cigarette/cigar
cost = 4 //smoking is bad mkay
modular_citadel/code/modules/client/loadout/head.dm
+14 -14
View File
@@ -1,74 +1,74 @@
/datum/gear/baseball
name = "Ballcap"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/soft/mime
/datum/gear/beanie
name = "Beanie"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/beanie
/datum/gear/beret
name = "Black beret"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/beret/black
/datum/gear/flatcap
name = "Flat cap"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/flatcap
/datum/gear/pirate
name = "Pirate hat"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/pirate
/datum/gear/rice_hat
name = "Rice hat"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/rice_hat
/datum/gear/ushanka
name = "Ushanka"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/ushanka
/datum/gear/slime
name = "Slime hat"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/collectable/slime
/datum/gear/fedora
name = "Fedora"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/fedora
/datum/gear/that
name = "Top Hat"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/that
//trek fancy Hats!
/datum/gear/trekcap
name = "Federation Officer's Cap"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/caphat/formal/fedcover
restricted_roles = list("Captain","Head of Personnel")
/datum/gear/trekcapmedisci
name = "Federation Officer's Cap"
category = slot_head
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")
/datum/gear/trekcapeng
name = "Federation Officer's Cap"
category = slot_head
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/trekcapsec
name = "Federation Officer's Cap"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/caphat/formal/fedcover/sec
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
modular_citadel/code/modules/client/loadout/mask.dm
+3 -3
View File
@@ -1,9 +1,9 @@
/datum/gear/balaclava
name = "Balaclava"
category = slot_wear_mask
category = SLOT_WEAR_MASK
path = /obj/item/clothing/mask/balaclava
/datum/gear/moustache
name = "Fake moustache"
category = slot_wear_mask
category = SLOT_WEAR_MASK
path = /obj/item/clothing/mask/fakemoustache
modular_citadel/code/modules/client/loadout/neck.dm
+17 -17
View File
@@ -1,84 +1,84 @@
/datum/gear/bluetie
name = "Blue tie"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/tie/blue
/datum/gear/redtie
name = "Red tie"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/tie/red
/datum/gear/blacktie
name = "Black tie"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/tie/black
/datum/gear/collar
name = "Collar"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/petcollar
/datum/gear/scarf
name = "White scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/scarf
/datum/gear/blackscarf
name = "Black scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/scarf/black
/datum/gear/redscarf
name = "Red scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/scarf/red
/datum/gear/greenscarf
name = "Green scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/scarf/green
/datum/gear/darkbluescarf
name = "Dark blue scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/scarf/darkblue
/datum/gear/purplescarf
name = "Purple scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/scarf/purple
/datum/gear/yellowscarf
name = "Yellow scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/scarf/yellow
/datum/gear/orangescarf
name = "Orange scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/scarf/orange
/datum/gear/cyanscarf
name = "Cyan scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/scarf/cyan
/datum/gear/stripedredscarf
name = "Striped red scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/stripedredscarf
/datum/gear/stripedbluescarf
name = "Striped blue scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/stripedbluescarf
/datum/gear/stripedgreenscarf
name = "Striped green scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/stripedgreenscarf
/datum/gear/headphones
name = "Headphones"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/ears/headphones
modular_citadel/code/modules/client/loadout/shoes.dm
+8 -8
View File
@@ -1,39 +1,39 @@
/datum/gear/laceup
name = "Laceup shoes"
category = slot_shoes
category = SLOT_SHOES
path = /obj/item/clothing/shoes/laceup
/datum/gear/workboots
name = "Work boots"
category = slot_shoes
category = SLOT_SHOES
path = /obj/item/clothing/shoes/workboots
/datum/gear/jackboots
name = "Jackboots"
category = slot_shoes
category = SLOT_SHOES
path = /obj/item/clothing/shoes/jackboots
/datum/gear/winterboots
name = "Winter boots"
category = slot_shoes
category = SLOT_SHOES
path = /obj/item/clothing/shoes/winterboots
/datum/gear/sandals
name = "Sandals"
category = slot_shoes
category = SLOT_SHOES
path = /obj/item/clothing/shoes/sandal
/datum/gear/blackshoes
name = "Black shoes"
category = slot_shoes
category = SLOT_SHOES
path = /obj/item/clothing/shoes/sneakers/black
/datum/gear/brownshoes
name = "Brown shoes"
category = slot_shoes
category = SLOT_SHOES
path = /obj/item/clothing/shoes/sneakers/brown
/datum/gear/whiteshoes
name = "White shoes"
category = slot_shoes
category = SLOT_SHOES
path = /obj/item/clothing/shoes/sneakers/white
modular_citadel/code/modules/client/loadout/suit.dm
+20 -20
View File
@@ -1,82 +1,82 @@
/datum/gear/poncho
name = "Poncho"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/poncho
/datum/gear/ponchogreen
name = "Green poncho"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/poncho/green
/datum/gear/ponchored
name = "Red poncho"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/poncho/red
/datum/gear/redhood
name = "Red cloak"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/hooded/cloak/david
cost = 3
/datum/gear/jacketbomber
name = "Bomber jacket"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/jacket
/datum/gear/jacketleather
name = "Leather jacket"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/jacket/leather
/datum/gear/overcoatleather
name = "Leather overcoat"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/jacket/leather/overcoat
/datum/gear/jacketpuffer
name = "Puffer jacket"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/jacket/puffer
/datum/gear/vestpuffer
name = "Puffer vest"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/jacket/puffer/vest
/datum/gear/jacketlettermanbrown
name = "Brown letterman jacket"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/jacket/letterman
/datum/gear/jacketlettermanred
name = "Red letterman jacket"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/jacket/letterman_red
/datum/gear/jacketlettermanNT
name = "Nanotrasen letterman jacket"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/jacket/letterman_nanotrasen
/datum/gear/coat
name = "Winter coat"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/hooded/wintercoat
/datum/gear/militaryjacket
name = "Military Jacket"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/jacket/miljacket
/datum/gear/ianshirt
name = "Ian Shirt"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/ianshirt
/datum/gear/trekds9_coat
name = "DS9 Overcoat (use uniform)"
category = slot_wear_suit
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",
@@ -85,24 +85,24 @@
//Federation jackets from movies
/datum/gear/trekcmdcap
name = "fed (movie) uniform, Captain"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/storage/fluff/fedcoat/capt
restricted_roles = list("Captain","Head of Personnel")
/datum/gear/trekcmdmov
name = "fed (movie) uniform, sec"
category = slot_wear_suit
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/trekmedscimov
name = "fed (movie) uniform, med/sci"
category = slot_wear_suit
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/trekengmov
name = "fed (movie) uniform, ops/eng"
category = slot_wear_suit
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")
modular_citadel/code/modules/client/loadout/uniform.dm
+43 -43
View File
@@ -1,143 +1,143 @@
/datum/gear/suitblack
name = "Black suit"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/suit_jacket
/datum/gear/suitgreen
name = "Green suit"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/suit_jacket/green
/datum/gear/suitred
name = "Red suit"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/suit_jacket/red
/datum/gear/suitcharcoal
name = "Charcoal suit"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/suit_jacket/charcoal
/datum/gear/suitnavy
name = "Navy suit"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/suit_jacket/navy
/datum/gear/suitburgundy
name = "Burgundy suit"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/suit_jacket/burgundy
/datum/gear/suittan
name = "Tan suit"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/suit_jacket/tan
/datum/gear/suitwhite
name = "White suit"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/suit_jacket/white
/datum/gear/assistantformal
name = "Assistant's formal uniform"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/assistantformal
/datum/gear/maidcostume
name = "Maid costume"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/maid
/datum/gear/mailmanuniform
name = "Mailman's jumpsuit"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/mailman
/datum/gear/skirtblack
name = "Black skirt"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/skirt/black
/datum/gear/skirtblue
name = "Blue skirt"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/skirt/blue
/datum/gear/skirtred
name = "Red skirt"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/skirt/red
/datum/gear/skirtpurple
name = "Purple skirt"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/skirt/purple
/datum/gear/kilt
name = "Kilt"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/kilt
/datum/gear/camoshorts
name = "Camo Pants"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/pants/camo
/datum/gear/bjeans
name = "Black Jeans"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/pants/blackjeans
/datum/gear/cjeans
name = "Classic Jeans"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/pants/classicjeans
/datum/gear/khaki
name = "Khaki Pants"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/pants/khaki
/datum/gear/wpants
name = "White Pants"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/pants/white
/datum/gear/rpants
name = "Red Pants"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/pants/red
/datum/gear/tpants
name = "Tan Pants"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/pants/tan
/datum/gear/trpants
name = "Track Pants"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/pants/track
/datum/gear/turtleneck
name = "Tactitool Turtleneck"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/syndicate/cosmetic
/datum/gear/polykilt
name = "Polychromic Kilt"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/polychromic/kilt
cost = 3
/datum/gear/polyshorts
name = "Polychromic Shorts"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/polychromic/shorts
cost = 3
/datum/gear/polyshortpants
name = "Polychromic Athletic Shorts"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/polychromic/shortpants
cost = 2
@@ -145,94 +145,94 @@
//TOS
/datum/gear/trekcmdtos
name = "TOS uniform, cmd"
category = slot_w_uniform
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/trekmedscitos
name = "TOS uniform, med/sci"
category = slot_w_uniform
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/trekengtos
name = "TOS uniform, ops/sec"
category = slot_w_uniform
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")
//TNG
/datum/gear/trekcmdtng
name = "TNG uniform, cmd"
category = slot_w_uniform
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/trekmedscitng
name = "TNG uniform, med/sci"
category = slot_w_uniform
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/trekengtng
name = "TNG uniform, ops/sec"
category = slot_w_uniform
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/trekcmdvoy
name = "VOY uniform, cmd"
category = slot_w_uniform
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/trekmedscivoy
name = "VOY uniform, med/sci"
category = slot_w_uniform
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/trekengvoy
name = "VOY uniform, ops/sec"
category = slot_w_uniform
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")
//DS9
/datum/gear/trekcmdds9
name = "DS9 uniform, cmd"
category = slot_w_uniform
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/trekmedscids9
name = "DS9 uniform, med/sci"
category = slot_w_uniform
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/trekengds9
name = "DS9 uniform, ops/sec"
category = slot_w_uniform
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")
//ENT
/datum/gear/trekcmdent
name = "ENT uniform, cmd"
category = slot_w_uniform
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/trekmedscient
name = "ENT uniform, med/sci"
category = slot_w_uniform
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")
/datum/gear/trekengent
name = "ENT uniform, ops/sec"
category = slot_w_uniform
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")
modular_citadel/code/modules/client/preferences.dm
+4 -4
View File
@@ -664,11 +664,11 @@
var/occupied_slots = L[slot_to_string(initial(G.category))] ? L[slot_to_string(initial(G.category))] + 1 : 1
LAZYSET(L, slot_to_string(initial(G.category)), occupied_slots)
switch(slot)
if(slot_in_backpack)
if(L[slot_to_string(slot_in_backpack)] < BACKPACK_SLOT_AMT)
if(SLOT_IN_BACKPACK)
if(L[slot_to_string(SLOT_IN_BACKPACK)] < BACKPACK_SLOT_AMT)
return TRUE
if(slot_hands)
if(L[slot_to_string(slot_hands)] < HANDS_SLOT_AMT)
if(SLOT_HANDS)
if(L[slot_to_string(SLOT_HANDS)] < HANDS_SLOT_AMT)
return TRUE
else
if(L[slot_to_string(slot)] < DEFAULT_SLOT_AMT)
modular_citadel/code/modules/custom_loadout/custom_items.dm
+1 -1
View File
@@ -290,7 +290,7 @@
H = loc
if(!H)
return
else if(H.get_item_by_slot(slot_neck) == src)
else if(H.get_item_by_slot(SLOT_NECK) == src)
if(H.arousalloss < H.max_arousal / 3)
H.arousalloss = H.max_arousal / 3
if(prob(5) && H.hallucination < 15)
modular_citadel/code/modules/custom_loadout/load_to_mob.dm
+1 -1
View File
@@ -52,7 +52,7 @@
loaded_atom.forceMove(T)
continue
var/obj/item/loaded = loaded_atom
var/obj/item/storage/S = H.get_item_by_slot(slot_back)
var/obj/item/storage/S = H.get_item_by_slot(SLOT_BACK)
if(istype(S))
S.SendSignal(COMSIG_TRY_STORAGE_INSERT,loaded, TRUE, H) //Force it into their backpack
continue