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

Merge remote-tracking branch 'polaris/master' into sink

Browse Source 
# Conflicts:
#	code/_onclick/item_attack.dm
#	code/modules/client/preferences.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	nano/images/nanomap_z1.png
#	vorestation.dme
This commit is contained in:
Leshana
2016-05-29 16:22:07 -04:00
parent 356b5e63cd 6f7960d7d4
commit e004a8bfc0
231 changed files with 5647 additions and 3412 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout.dm
+5 -3
View File
@@ -63,6 +63,8 @@ var/list/gear_datums = list()
return valid_gear_choices
/datum/category_item/player_setup_item/loadout/sanitize_character()
if(!islist(pref.gear))
pref.gear = list()
for(var/gear_name in pref.gear)
if(!(gear_name in gear_datums))
@@ -169,7 +171,7 @@ var/list/gear_datums = list()
if(istype(G)) total_cost += G.cost
if((total_cost+TG.cost) <= MAX_GEAR_COST)
pref.gear += TG.display_name
return TOPIC_REFRESH
return TOPIC_REFRESH_UPDATE_PREVIEW
if(href_list["gear"] && href_list["tweak"])
var/datum/gear/gear = gear_datums[href_list["gear"]]
var/datum/gear_tweak/tweak = locate(href_list["tweak"])
@@ -179,13 +181,13 @@ var/list/gear_datums = list()
if(!metadata || !CanUseTopic(user))
return TOPIC_NOACTION
set_tweak_metadata(gear, tweak, metadata)
return TOPIC_REFRESH
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["select_category"])
current_tab = href_list["select_category"]
return TOPIC_REFRESH
else if(href_list["clear_loadout"])
pref.gear.Cut()
return TOPIC_REFRESH
return TOPIC_REFRESH_UPDATE_PREVIEW
return ..()
/datum/gear
code/modules/client/preference_setup/loadout/loadout_general.dm
+11 -1
View File
@@ -68,4 +68,14 @@
/datum/gear/towel/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/cahwhite
display_name = "Cards Against The Galaxy (white deck)"
path = /obj/item/weapon/deck/cah
description = "The ever-popular Cards Against The Galaxy word game. Warning: may include traces of broken fourth wall. This is the white deck."
/datum/gear/cahblack
display_name = "Cards Against The Galaxy (black deck)"
path = /obj/item/weapon/deck/cah/black
description = "The ever-popular Cards Against The Galaxy word game. Warning: may include traces of broken fourth wall. This is the black deck."
code/modules/client/preference_setup/loadout/loadout_shoes.dm
+1 -1
View File
@@ -7,7 +7,7 @@
/datum/gear/shoes/toeless
display_name = "toe-less jackboots"
path = /obj/item/clothing/shoes/jackboots/unathi
path = /obj/item/clothing/shoes/jackboots/toeless
/datum/gear/shoes/workboots
display_name = "workboots"
code/modules/client/preference_setup/loadout/loadout_suit.dm
+13 -1
View File
@@ -255,4 +255,16 @@
for(var/varsity_style in typesof(/obj/item/clothing/suit/varsity))
var/obj/item/clothing/suit/varsity/varsity = varsity_style
varsities[initial(varsity.name)] = varsity
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(varsities))
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(varsities))
/datum/gear/suit/track
display_name = "track jacket selection"
path = /obj/item/clothing/suit/storage/toggle/track
/datum/gear/suit/track/New()
..()
var/list/tracks = list()
for(var/track_style in typesof(/obj/item/clothing/suit/storage/toggle/track))
var/obj/item/clothing/suit/storage/toggle/track/track = track_style
tracks[initial(track.name)] = track
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(tracks))