cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 20:17:15 +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/game/objects/items/devices/translator.dm
#	code/game/objects/items/weapons/dna_injector.dm
#	code/modules/client/preference_setup/loadout/loadout_ears.dm
#	code/modules/mob/living/simple_animal/aliens/hivebot.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-3.dmm
This commit is contained in:
Arokha Sieyes
2018-03-03 13:09:57 -05:00
parent 2123255667 9d001c25aa
commit 68a5fabe11
126 changed files with 320994 additions and 5217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_ears.dm
+1 -6
View File
@@ -7,9 +7,4 @@
/datum/gear/ears/headphones
display_name = "headphones"
path = /obj/item/clothing/ears/earmuffs/headphones
/* VOREStation Edit - Make languages great again
/datum/gear/ears/translator
display_name = "universal translator, ear"
path = /obj/item/device/universal_translator/ear
cost = 8*/
path = /obj/item/clothing/ears/earmuffs/headphones
code/modules/client/preference_setup/loadout/loadout_shoes.dm
+8
View File
@@ -141,6 +141,14 @@
display_name = "cowboy boots"
path = /obj/item/clothing/shoes/boots/cowboy
/datum/gear/shoes/cowboy/classic
display_name = "classic cowboy boots"
path = /obj/item/clothing/shoes/boots/cowboy/classic
/datum/gear/shoes/cowboy/snakeskin
display_name = "snakeskin cowboy boots"
path = /obj/item/clothing/shoes/boots/cowboy/snakeskin
/datum/gear/shoes/jungle
display_name = "jungle boots"
path = /obj/item/clothing/shoes/boots/jungle
code/modules/client/preference_setup/loadout/loadout_suit.dm
+8
View File
@@ -90,6 +90,14 @@
display_name = "trenchcoat, grey"
path = /obj/item/clothing/suit/storage/trench/grey
datum/gear/suit/duster
display_name = "cowboy duster"
path = /obj/item/clothing/suit/storage/duster
/datum/gear/suit/duster/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/suit/hazard_vest
display_name = "hazard vest selection"
path = /obj/item/clothing/suit/storage/hazardvest
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+9 -1
View File
@@ -448,4 +448,12 @@
/datum/gear/uniform/bathrobe
display_name = "bathrobe"
path = /obj/item/clothing/under/bathrobe
path = /obj/item/clothing/under/bathrobe
/datum/gear/uniform/flamenco
display_name = "flamenco dress"
path = /obj/item/clothing/under/dress/flamenco
/datum/gear/uniform/westernbustle
display_name = "western bustle"
path = /obj/item/clothing/under/dress/westernbustle
code/modules/client/preference_setup/loadout/loadout_utility.dm
+9 -5
View File
@@ -121,11 +121,6 @@
slot = "implant"
exploitable = 1
/datum/gear/utility/translator
display_name = "universal translator"
path = /obj/item/device/universal_translator
cost = 8
/datum/gear/utility/pen
display_name = "Fountain Pen"
path = /obj/item/weapon/pen/fountain
@@ -138,3 +133,12 @@
/datum/gear/utility/wheelchair/color/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/utility/umbrella
display_name = "Umbrella"
path = /obj/item/weapon/melee/umbrella
cost = 3
/datum/gear/utility/umbrella/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)