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

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

Browse Source 
# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/mob/mob.dm
#	html/changelogs/.all_changelog.yml
This commit is contained in:
Arokha Sieyes
2017-04-10 20:41:18 -04:00
parent 49f0661d36 43f6f48abb
commit e7d8af7ae7
82 changed files with 3523 additions and 2505 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_gloves.dm
+5 -1
View File
@@ -28,7 +28,11 @@
/datum/gear/gloves/latex
display_name = "gloves, latex"
path = /obj/item/clothing/gloves/latex
path = /obj/item/clothing/gloves/sterile/latex
/datum/gear/gloves/nitrile
display_name = "gloves, nitrile"
path = /obj/item/clothing/gloves/sterile/nitrile
/datum/gear/gloves/orange
display_name = "gloves, orange"
code/modules/client/preference_setup/loadout/loadout_head.dm
-5
View File
@@ -236,11 +236,6 @@
display_name = "santa hat, green (holiday)"
path = /obj/item/clothing/head/santa/green
/datum/gear/head/zhan_scarf
display_name = "Zhan headscarf"
path = /obj/item/clothing/head/tajaran/scarf
whitelisted = "Tajara"
/datum/gear/head/hijab
display_name = "hijab"
path = /obj/item/clothing/head/hijab
code/modules/client/preference_setup/loadout/loadout_suit.dm
+9
View File
@@ -118,6 +118,10 @@
display_name = "labcoat, blue"
path = /obj/item/clothing/suit/storage/toggle/labcoat/blue
/datum/gear/suit/labcoat/blue_edge
display_name = "labcoat, blue-edged"
path = /obj/item/clothing/suit/storage/toggle/labcoat/blue_edge
/datum/gear/suit/labcoat/green
display_name = "labcoat, green"
path = /obj/item/clothing/suit/storage/toggle/labcoat/green
@@ -147,6 +151,11 @@
path = /obj/item/clothing/suit/storage/toggle/labcoat/emt
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist")
/datum/gear/suit/roles/surgical_apron
display_name = "surgical apron"
path = /obj/item/clothing/suit/surgicalapron
allowed_roles = list("Medical Doctor","Chief Medical Officer")
/datum/gear/suit/overalls
display_name = "overalls"
path = /obj/item/clothing/suit/storage/apron/overalls
code/modules/client/preference_setup/loadout/loadout_utility.dm
+5
View File
@@ -13,6 +13,11 @@
path = /obj/item/device/communicator
cost = 0
/datum/gear/utility/codex
display_name = "the traveler's guide to vir"
path = /obj/item/weapon/book/codex
cost = 0
/datum/gear/utility/folder_blue
display_name = "folder, blue"
path = /obj/item/weapon/folder/blue
code/modules/client/preference_setup/loadout/loadout_xeno.dm
+12 -1
View File
@@ -4,6 +4,11 @@
path = /obj/item/clothing/suit/tajaran/furs
sort_category = "Xenowear"
/datum/gear/head/zhan_scarf
display_name = "Zhan headscarf"
path = /obj/item/clothing/head/tajaran/scarf
whitelisted = "Tajara"
/datum/gear/suit/unathi_mantle
display_name = "hide mantle (Unathi)"
path = /obj/item/clothing/suit/unathi/mantle
@@ -112,4 +117,10 @@
/datum/gear/uniform/harness
display_name = "gear harness (Full Body Prosthetic, Diona)"
path = /obj/item/clothing/under/harness
sort_category = "Xenowear"
sort_category = "Xenowear"
/datum/gear/shoes/footwraps
display_name = "cloth footwraps"
path = /obj/item/clothing/shoes/footwraps
sort_category = "Xenowear"
cost = 1