cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-19 02:52:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Polaris sync

Browse Source
This commit is contained in:
killer653
2017-12-20 23:20:51 -05:00
parent 99d641e5bc b7c67cba68
commit 3a2093ef40
514 changed files with 13847 additions and 5596 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_accessories.dm
+33 -1
View File
@@ -202,7 +202,7 @@
/datum/gear/accessory/sweater
display_name = "Sweater Selection"
display_name = "sweater selection"
path = /obj/item/clothing/accessory/sweater
/datum/gear/accessory/sweater/New()
@@ -212,3 +212,35 @@
var/obj/item/clothing/suit/sweater_type = sweater
sweaters[initial(sweater_type.name)] = sweater_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sweaters))
/datum/gear/accessory/bracelet/material
display_name = "bracelet selection"
description = "Choose from a number of bracelets."
path = /obj/item/clothing/accessory/bracelet
cost = 1
/datum/gear/accessory/bracelet/material/New()
..()
var/bracelettype = list()
bracelettype["bracelet, steel"] = /obj/item/clothing/accessory/bracelet/material/steel
bracelettype["bracelet, iron"] = /obj/item/clothing/accessory/bracelet/material/iron
bracelettype["bracelet, silver"] = /obj/item/clothing/accessory/bracelet/material/silver
bracelettype["bracelet, gold"] = /obj/item/clothing/accessory/bracelet/material/gold
bracelettype["bracelet, platinum"] = /obj/item/clothing/accessory/bracelet/material/platinum
bracelettype["bracelet, glass"] = /obj/item/clothing/accessory/bracelet/material/glass
bracelettype["bracelet, wood"] = /obj/item/clothing/accessory/bracelet/material/wood
bracelettype["bracelet, plastic"] = /obj/item/clothing/accessory/bracelet/material/plastic
gear_tweaks += new/datum/gear_tweak/path(bracelettype)
/datum/gear/accessory/bracelet/friendship
display_name = "friendship bracelet"
path = /obj/item/clothing/accessory/bracelet/friendship
/datum/gear/accessory/stethoscope
display_name = "stethoscope"
path = /obj/item/clothing/accessory/stethoscope
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic")
/datum/gear/accessory/locket
display_name = "locket"
path = /obj/item/clothing/accessory/locket
code/modules/client/preference_setup/loadout/loadout_cosmetics.dm
+9 -5
View File
@@ -1,16 +1,20 @@
/datum/gear/lipstick
/datum/gear/cosmetic/lipstick/black
display_name = "lipstick, black"
path = /obj/item/weapon/lipstick/black
sort_category = "Cosmetics"
/datum/gear/lipstick/jade
/datum/gear/cosmetic/lipstick/jade
display_name = "lipstick, jade"
path = /obj/item/weapon/lipstick/jade
/datum/gear/lipstick/purple
/datum/gear/cosmetic/lipstick/purple
display_name = "lipstick, purple"
path = /obj/item/weapon/lipstick/purple
/datum/gear/lipstick/red
/datum/gear/cosmetic/lipstick
display_name = "lipstick, red"
path = /obj/item/weapon/lipstick
/datum/gear/cosmetic
display_name = "purple comb"
path = /obj/item/weapon/haircomb
sort_category = "Cosmetics"
code/modules/client/preference_setup/loadout/loadout_eyes.dm
+11 -7
View File
@@ -18,14 +18,18 @@
path = /obj/item/clothing/glasses/regular/hipster
/datum/gear/eyes/glasses/monocle
display_name = "Monocle"
display_name = "monocle"
path = /obj/item/clothing/glasses/monocle
/datum/gear/eyes/scanning_goggles
/datum/gear/eyes/goggles
display_name = "plain goggles"
path = /obj/item/clothing/glasses/goggles
/datum/gear/eyes/goggles/scanning
display_name = "scanning goggles"
path = /obj/item/clothing/glasses/regular/scanners
/datum/gear/eyes/sciencegoggles
/datum/gear/eyes/goggles/science
display_name = "Science Goggles"
path = /obj/item/clothing/glasses/science
@@ -53,7 +57,7 @@
/datum/gear/eyes/medical
display_name = "Medical HUD (Medical)"
path = /obj/item/clothing/glasses/hud/health
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist")
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist")
/datum/gear/eyes/medical/prescriptionmed
display_name = "Medical HUD, prescription (Medical)"
@@ -73,7 +77,7 @@
allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director")
/datum/gear/eyes/meson/prescription
display_name = "Optical Meson Scanners, prescription (Engineering)"
display_name = "Optical Meson Scanners, prescription (Engineering, Science)"
path = /obj/item/clothing/glasses/meson/prescription
/datum/gear/eyes/material
@@ -86,11 +90,11 @@
path = /obj/item/clothing/glasses/material/prescription
/datum/gear/eyes/meson/aviator
display_name = "Optical Meson Aviators, (Engineering)"
display_name = "Optical Meson Aviators, (Engineering, Science)"
path = /obj/item/clothing/glasses/meson/aviator
/datum/gear/eyes/meson/aviator/prescription
display_name = "Optical Meson Aviators, prescription (Engineering)"
display_name = "Optical Meson Aviators, prescription (Engineering, Science)"
path = /obj/item/clothing/glasses/meson/aviator/prescription
/datum/gear/eyes/glasses/fakesun
code/modules/client/preference_setup/loadout/loadout_general.dm
+4 -4
View File
@@ -2,6 +2,10 @@
display_name = "cane"
path = /obj/item/weapon/cane
/datum/gear/cane/white
display_name = "white cane"
path = /obj/item/weapon/cane/whitecane
/datum/gear/dice
display_name = "dice pack"
path = /obj/item/weapon/storage/pill_bottle/dice
@@ -62,10 +66,6 @@
..()
gear_tweaks += new/datum/gear_tweak/reagents(lunchables_drink_reagents())
/datum/gear/comb
display_name = "purple comb"
path = /obj/item/weapon/haircomb
/datum/gear/lunchbox
display_name = "lunchbox"
description = "A little lunchbox."
code/modules/client/preference_setup/loadout/loadout_head.dm
+48 -25
View File
@@ -114,9 +114,13 @@
path = /obj/item/clothing/head/soft/yellow
/datum/gear/head/cap/white
display_name = "cap, white"
display_name = "cap (colorable)"
path = /obj/item/clothing/head/soft/mime
/datum/gear/head/cap/white/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/head/cap/mbill
display_name = "cap, bill"
path = /obj/item/clothing/head/soft/mbill
@@ -154,29 +158,37 @@
path = /obj/item/clothing/head/fedora/grey
/datum/gear/head/hairflower
display_name = "hair flower pin"
path = /obj/item/clothing/head/hairflower/white
display_name = "hair flower pin (colorable)"
path = /obj/item/clothing/head/pin/flower/white
/datum/gear/head/hairflower/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/head/pin
display_name = "pin selection"
path = /obj/item/clothing/head/pin
/datum/gear/head/pin/New()
..()
var/list/pins = list()
for(var/pin in typesof(/obj/item/clothing/head/pin))
var/obj/item/clothing/head/pin/pin_type = pin
pins[initial(pin_type.name)] = pin_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pins))
/datum/gear/head/hardhat
display_name = "hardhat, yellow"
display_name = "hardhat selection"
path = /obj/item/clothing/head/hardhat
cost = 2
/datum/gear/head/hardhat/blue
display_name = "hardhat, blue"
path = /obj/item/clothing/head/hardhat/dblue
/datum/gear/head/hardhat/orange
display_name = "hardhat, orange"
path = /obj/item/clothing/head/hardhat/orange
/datum/gear/head/hardhat/red
display_name = "hardhat, red"
path = /obj/item/clothing/head/hardhat/red
/datum/gear/head/hardhat/New()
..()
var/list/hardhats = list()
for(var/hardhat in typesof(/obj/item/clothing/head/hardhat))
var/obj/item/clothing/head/hardhat/hardhat_type = hardhat
hardhats[initial(hardhat_type.name)] = hardhat_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hardhats))
/datum/gear/head/boater
display_name = "hat, boatsman"
@@ -194,22 +206,30 @@
display_name = "hat, tophat"
path = /obj/item/clothing/head/that
/datum/gear/head/philosopher_wig
/datum/gear/head/wig/philosopher
display_name = "natural philosopher's wig"
path = /obj/item/clothing/head/philosopher_wig
/datum/gear/head/wig
display_name = "powdered wig"
path = /obj/item/clothing/head/powdered_wig
/datum/gear/head/ushanka
display_name = "ushanka"
path = /obj/item/clothing/head/ushanka
/datum/gear/head/santahat
display_name = "santa hat, red (holiday)"
display_name = "santa hat"
path = /obj/item/clothing/head/santa
cost = 2
/datum/gear/head/santahat/green
display_name = "santa hat, green (holiday)"
path = /obj/item/clothing/head/santa/green
/datum/gear/head/santahat/New()
..()
var/list/santahats = list()
for(var/santahat in typesof(/obj/item/clothing/head/santa))
var/obj/item/clothing/head/santa/santahat_type = santahat
santahats[initial(santahat_type.name)] = santahat_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(santahats))
/datum/gear/head/hijab
display_name = "hijab"
@@ -243,11 +263,14 @@
..()
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/head/kitty
display_name = "kitty ears"
path = /obj/item/clothing/head/kitty
/datum/gear/head/rabbit
display_name = "rabbit ears"
path = /obj/item/clothing/head/rabbitears
/datum/gear/head/beanie
display_name = "beanie"
path = /obj/item/clothing/head/beanie
@@ -284,11 +307,11 @@
..()
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/head/bow
display_name = "hair bow"
path = /obj/item/clothing/head/hairflower/bow
/datum/gear/head/bow/small
display_name = "hair bow, small (colorable)"
path = /obj/item/clothing/head/pin/bow
/datum/gear/head/bow/New()
/datum/gear/head/bow/small/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
code/modules/client/preference_setup/loadout/loadout_smoking.dm
+18 -9
View File
@@ -1,20 +1,29 @@
/datum/gear/smokingpipe
display_name = "pipe, smoking"
/datum/gear/pipe
display_name = "pipe"
path = /obj/item/clothing/mask/smokable/pipe
/datum/gear/cornpipe
display_name = "pipe, corn"
path = /obj/item/clothing/mask/smokable/pipe/cobpipe
/datum/gear/pipe/New()
..()
var/list/pipes = list()
for(var/pipe_style in typesof(/obj/item/clothing/mask/smokable/pipe))
var/obj/item/clothing/mask/smokable/pipe/pipe = pipe_style
pipes[initial(pipe.name)] = pipe
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pipes))
/datum/gear/matchbook
display_name = "matchbook"
path = /obj/item/weapon/storage/box/matches
/datum/gear/zippo
display_name = "Zippo Selection"
/datum/gear/lighter
display_name = "cheap lighter"
path = /obj/item/weapon/flame/lighter
/datum/gear/lighter/zippo
display_name = "Zippo selection"
path = /obj/item/weapon/flame/lighter/zippo
/datum/gear/zippo/New()
/datum/gear/lighter/zippo/New()
..()
var/list/zippos = list()
for(var/zippo in typesof(/obj/item/weapon/flame/lighter/zippo))
@@ -40,4 +49,4 @@
for(var/cigarette in (typesof(/obj/item/weapon/storage/fancy/cigarettes) - typesof(/obj/item/weapon/storage/fancy/cigarettes/killthroat)))
var/obj/item/weapon/storage/fancy/cigarettes/cigarette_brand = cigarette
cigarettes[initial(cigarette_brand.name)] = cigarette_brand
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cigarettes))
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cigarettes))
code/modules/client/preference_setup/loadout/loadout_suit.dm
+4 -12
View File
@@ -6,6 +6,10 @@
sort_category = "Suits and Overwear"
cost = 2
/datum/gear/suit/greatcoat
display_name = "greatcoat"
path = /obj/item/clothing/suit/greatcoat
/datum/gear/suit/leather_coat
display_name = "leather coat"
path = /obj/item/clothing/suit/leathercoat
@@ -380,18 +384,6 @@
display_name = "denim vest, corporate"
path = /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen/sleeveless
/datum/gear/suit/service
display_name = "service jacket selection"
path = /obj/item/clothing/suit/storage/service
/datum/gear/suit/service/New()
..()
var/list/services = list()
for(var/service_style in typesof(/obj/item/clothing/suit/storage/service))
var/obj/item/clothing/suit/storage/service/service = service_style
services[initial(service.name)] = service
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(services))
/datum/gear/suit/miscellaneous/kimono
display_name = "kimono"
path = /obj/item/clothing/suit/kimono
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+16 -25
View File
@@ -349,7 +349,7 @@
/datum/gear/uniform/whitewedding
display_name= "white wedding dress"
path = /obj/item/clothing/under/dress/white
path = /obj/item/clothing/under/wedding/bride_white
/datum/gear/uniform/skirts
display_name = "executive skirt"
@@ -363,38 +363,29 @@
display_name = "red evening gown"
path = /obj/item/clothing/under/dress/redeveninggown
/datum/gear/uniform/dresses/janimaid
display_name = "maid uniform"
path = /obj/item/clothing/under/dress/janimaid
/datum/gear/uniform/dresses/maid
display_name = "maid uniform selection"
path = /obj/item/clothing/under/dress/maid
/datum/gear/uniform/dresses/sexymaid
display_name = "sexy maid uniform"
path = /obj/item/clothing/under/dress/sexymaid
/datum/gear/uniform/pt
display_name = "pt uniform"
path = /obj/item/clothing/under/pt
/datum/gear/uniform/pt/expeditionary
display_name = "pt uniform, sifguard"
path = /obj/item/clothing/under/pt/expeditionary
/datum/gear/uniform/pt/fleet
display_name = "pt uniform, fleet"
path = /obj/item/clothing/under/pt/fleet
/datum/gear/uniform/dresses/maid/New()
..()
var/list/maids = list()
for(var/maid in typesof(/obj/item/clothing/under/dress/maid))
var/obj/item/clothing/under/dress/maid/maid_type = maid
maids[initial(maid_type.name)] = maid_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(maids))
/datum/gear/uniform/utility
display_name = "utility, black"
path = /obj/item/clothing/under/utility
cost = 2
/datum/gear/uniform/utility/fleet
display_name = "utility, navy"
path = /obj/item/clothing/under/utility/fleet
/datum/gear/uniform/utility/blue
display_name = "utility, blue"
path = /obj/item/clothing/under/utility/blue
/datum/gear/uniform/utility/marine
/datum/gear/uniform/utility/grey
display_name = "utility, grey"
path = /obj/item/clothing/under/utility/marine
path = /obj/item/clothing/under/utility/grey
/datum/gear/uniform/sweater
display_name = "sweater, grey"
code/modules/client/preference_setup/loadout/loadout_utility.dm
+4
View File
@@ -13,6 +13,10 @@
path = /obj/item/device/communicator
cost = 0
/datum/gear/utility/camera
display_name = "camera"
path = /obj/item/device/camera
/datum/gear/utility/codex
display_name = "the traveler's guide to vir"
path = /obj/item/weapon/book/codex //VOREStation Edit
code/modules/client/preference_setup/loadout/loadout_xeno.dm
+16 -8
View File
@@ -43,25 +43,33 @@
bandtypes[initial(band.name)] = band
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(bandtypes))
/datum/gear/ears/skrell/cloth/male
display_name = "male headtail cloth (Skrell)"
/datum/gear/ears/skrell/cloth/short
display_name = "short headtail cloth (Skrell)"
path = /obj/item/clothing/ears/skrell/cloth_male/black
sort_category = "Xenowear"
whitelisted = "Skrell"
/datum/gear/ears/skrell/cloth/male/New()
/datum/gear/ears/skrell/cloth/short/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
var/list/shorttypes = list()
for(var/short_style in typesof(/obj/item/clothing/ears/skrell/cloth_male))
var/obj/item/clothing/ears/skrell/cloth_male/short = short_style
shorttypes[initial(short.name)] = short
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(shorttypes))
/datum/gear/ears/skrell/cloth/female
display_name = "female headtail cloth (Skrell)"
/datum/gear/ears/skrell/cloth/long
display_name = "long headtail cloth (Skrell)"
path = /obj/item/clothing/ears/skrell/cloth_female/black
sort_category = "Xenowear"
whitelisted = "Skrell"
/datum/gear/ears/skrell/cloth/female/New()
/datum/gear/ears/skrell/cloth/long/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
var/list/longtypes = list()
for(var/long_style in typesof(/obj/item/clothing/ears/skrell/cloth_female))
var/obj/item/clothing/ears/skrell/cloth_female/long = long_style
longtypes[initial(long.name)] = long
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(longtypes))
/datum/gear/ears/skrell/colored/band
display_name = "Colored bands (Skrell)"
code/modules/client/preference_setup/traits/trait_defines.dm
+12 -1
View File
@@ -183,6 +183,17 @@
desc = "Small spaces and tight quarters makes you feel distressed. Unfortunately both are rather common when living in space."
modifier_type = /datum/modifier/trait/phobia/claustrophobe
/datum/trait/modifier/mental/blennophobe
name = "Blennophobia"
desc = "Slimes are quite dangerous, but just the aspect of something being slimey is uncomfortable."
modifier_type = /datum/modifier/trait/phobia/blennophobe
/datum/trait/modifier/mental/trypanophobe
name = "Trypanophobia"
desc = "Syringes and needles make you very distressed. You really don't want to get sick..."
modifier_type = /datum/modifier/trait/phobia/trypanophobe
/*
// Uncomment this when/if these get finished.
/datum/trait/modifier/mental/synthphobe
@@ -239,4 +250,4 @@
name = "Promethean-phobic"
desc = "Boilerplate racism for jellos goes here."
mutually_exclusive = list(/datum/trait/modifier/mental/xenophobe)
*/
*/