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

Polaris Merge Sync

Browse Source
This commit is contained in:
Arokha Sieyes
2017-03-26 20:12:34 -04:00
parent b48853fb95 565fea9648
commit 9edf3a6629
105 changed files with 484 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/general/04_equipment.dm
+1 -1
View File
@@ -38,7 +38,7 @@
pref.backbag = 1 //Same as above
character.backbag = pref.backbag
if(pref.pdachoice > 3 || pref.pdachoice < 1)
if(pref.pdachoice > 4 || pref.pdachoice < 1)
pref.pdachoice = 1
character.pdachoice = pref.pdachoice
code/modules/client/preference_setup/loadout/loadout_shoes.dm
+9 -1
View File
@@ -153,4 +153,12 @@
/datum/gear/shoes/dress/white
display_name = "shoes, dress white"
path = /obj/item/clothing/shoes/dress/white
path = /obj/item/clothing/shoes/dress/white
/datum/gear/shoes/heels
display_name = "high heels"
path = /obj/item/clothing/shoes/heels
/datum/gear/shoes/heels/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
code/modules/client/preference_setup/loadout/loadout_suit.dm
+11
View File
@@ -348,3 +348,14 @@
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
/datum/gear/suit/miscellaneous/kimono/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/suit/miscellaneous/redandblackjacket
display_name = "red and black jacket"
path = /obj/item/clothing/suit/storage/toggle/redandblackjacket
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+11 -3
View File
@@ -273,11 +273,11 @@
/datum/gear/uniform/sundress
display_name = "sundress"
path = /obj/item/clothing/under/sundress
path = /obj/item/clothing/under/dress/sundress
/datum/gear/uniform/sundress/white
display_name = "sundress, white"
path = /obj/item/clothing/under/sundress_white
path = /obj/item/clothing/under/dress/sundress/white
/datum/gear/uniform/dress_fire
display_name = "flame dress"
@@ -444,4 +444,12 @@
/datum/gear/uniform/brandsuit/hephaestus
display_name = "jumpsuit, hephaestus"
path = /obj/item/clothing/under/hephaestus
path = /obj/item/clothing/under/hephaestus
/datum/gear/uniform/yoga
display_name = "yoga pants"
path = /obj/item/clothing/under/pants/yoga
/datum/gear/uniform/yoga/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)