cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 19:47:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Polaris Sync

Browse Source
This commit is contained in:
killer653
2017-11-04 13:37:13 -04:00
parent 225932aa5e 0b0846ec86
commit 11c195debb
97 changed files with 1307 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_general.dm
+12
View File
@@ -34,6 +34,18 @@
display_name = "Spaceball booster pack"
path = /obj/item/weapon/pack/spaceball
/datum/gear/plushie
display_name = "plushie selection"
path = /obj/item/toy/plushie/
/datum/gear/plushie/New()
..()
var/list/plushies = list()
for(var/plushie in subtypesof(/obj/item/toy/plushie/) - /obj/item/toy/plushie/therapy)
var/obj/item/toy/plushie/plushie_type = plushie
plushies[initial(plushie_type.name)] = plushie_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(plushies))
/datum/gear/flask
display_name = "flask"
path = /obj/item/weapon/reagent_containers/food/drinks/flask/barflask
code/modules/client/preference_setup/loadout/loadout_head.dm
+2 -26
View File
@@ -154,34 +154,10 @@
path = /obj/item/clothing/head/fedora/grey
/datum/gear/head/hairflower
display_name = "hair flower pin, red"
path = /obj/item/clothing/head/hairflower
/datum/gear/head/hairflower/yellow
display_name = "hair flower pin, yellow"
path = /obj/item/clothing/head/hairflower/yellow
/datum/gear/head/hairflower/pink
display_name = "hair flower pin, pink"
path = /obj/item/clothing/head/hairflower/pink
/datum/gear/head/hairflower/blue
display_name = "hair flower pin, blue"
path = /obj/item/clothing/head/hairflower/blue
/datum/gear/head/hairflower/violet
display_name = "hair flower pin, violet"
path = /obj/item/clothing/head/hairflower/violet
/datum/gear/head/hairflower/orange
display_name = "hair flower pin, orange"
path = /obj/item/clothing/head/hairflower/orange
/datum/gear/head/hairflower/white
display_name = "hair flower pin"
path = /obj/item/clothing/head/hairflower/white
/datum/gear/head/hairflower/white/New()
/datum/gear/head/hairflower/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
@@ -372,4 +348,4 @@
/datum/gear/head/surgical/purple
display_name = "surgical cap, purple"
path = /obj/item/clothing/head/surgery/purple
path = /obj/item/clothing/head/surgery/purple
code/modules/client/preference_setup/loadout/loadout_shoes.dm
+3 -31
View File
@@ -73,10 +73,6 @@
display_name = "shoes, yellow"
path = /obj/item/clothing/shoes/yellow
/datum/gear/shoes/flats
display_name = "flats, black"
path = /obj/item/clothing/shoes/flats
/datum/gear/shoes/hitops/
display_name = "high-top, white"
path = /obj/item/clothing/shoes/hitops/
@@ -109,30 +105,6 @@
display_name = "high-top, yellow"
path = /obj/item/clothing/shoes/hitops/yellow
/datum/gear/shoes/flats/blue
display_name = "flats, blue"
path = /obj/item/clothing/shoes/flats/blue
/datum/gear/shoes/flats/brown
display_name = "flats, brown"
path = /obj/item/clothing/shoes/flats/brown
/datum/gear/shoes/flats/orange
display_name = "flats, orange"
path = /obj/item/clothing/shoes/flats/orange
/datum/gear/shoes/flats/purple
display_name = "flats, purple"
path = /obj/item/clothing/shoes/flats/purple
/datum/gear/shoes/flats/red
display_name = "flats, red"
path = /obj/item/clothing/shoes/flats/red
/datum/gear/shoes/flats/white
display_name = "flats, white"
path = /obj/item/clothing/shoes/flats/white
/datum/gear/shoes/flipflops
display_name = "flip flops"
path = /obj/item/clothing/shoes/flipflop
@@ -157,11 +129,11 @@
..()
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/shoes/flats/color
/datum/gear/shoes/flats
display_name = "flats"
path = /obj/item/clothing/shoes/flats/white/color
/datum/gear/shoes/flats/color/New()
/datum/gear/shoes/flats/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
@@ -246,4 +218,4 @@
/datum/gear/shoes/boots/winter/hydro
display_name = "hydroponics winter boots"
path = /obj/item/clothing/shoes/boots/winter/hydro
allowed_roles = list("Botanist", "Xenobiologist")
allowed_roles = list("Botanist", "Xenobiologist")