| [G.display_name] | "
entry += "[G.cost] | "//inf, was: entry += "[G.cost] | "
entry += "[G.get_description(get_gear_metadata(G,1))]"
var/allowed = 1
@@ -260,15 +260,15 @@ var/list/gear_datums = list()
skill_checks += skill_entry
entry += "[english_list(skill_checks)]"
-
+
if(allowed && G.allowed_backgrounds)
var/good_background = 0
var/decl/cultural_info/background = SSculture.get_culture(pref.cultural_info[TAG_FACTION])
var/bgndname = background ? background.name : "Unset"
entry += "
"
-
+
var/list/backgroundchecks = list()
-
+
if(bgndname in G.allowed_backgrounds)
backgroundchecks += "[bgndname]"
good_background = 1
@@ -312,6 +312,14 @@ var/list/gear_datums = list()
var/list/metadata = get_gear_metadata(G)
metadata["[tweak]"] = new_metadata
+/datum/category_item/player_setup_item/loadout/proc/update_gear_icon(var/datum/gear/G, var/datum/gear_tweak/tweak, var/metadata)
+ if(istype(tweak, /datum/gear_tweak/path))
+ var/datum/gear_tweak/path/path_tweak = tweak
+ G.path = path_tweak.valid_paths[metadata]
+ G.update_icon()
+ if(istype(tweak, /datum/gear_tweak/color))
+ G.update_icon(metadata)
+
/datum/category_item/player_setup_item/loadout/OnTopic(href, href_list, user)
if(href_list["toggle_gear"])
var/datum/gear/TG = locate(href_list["toggle_gear"])
@@ -319,6 +327,8 @@ var/list/gear_datums = list()
return TOPIC_REFRESH
if((TG.display_name in pref.gear_list[pref.gear_slot]) || !gear_allowed_to_equip(TG, user)) //inf, was: if(TG.display_name in pref.gear_list[pref.gear_slot])
pref.gear_list[pref.gear_slot] -= TG.display_name
+ TG.path = initial(TG.path)
+ TG.update_icon()
else
var/total_cost = 0
for(var/gear_name in pref.gear_list[pref.gear_slot])
@@ -335,6 +345,7 @@ var/list/gear_datums = list()
var/metadata = tweak.get_metadata(user, get_tweak_metadata(gear, tweak))
if(!metadata || !CanUseTopic(user))
return TOPIC_NOACTION
+ update_gear_icon(gear, tweak, metadata)
set_tweak_metadata(gear, tweak, metadata)
return TOPIC_REFRESH_UPDATE_PREVIEW
if(href_list["next_slot"])
@@ -362,7 +373,10 @@ var/list/gear_datums = list()
/datum/gear
var/display_name //Name/index. Must be unique.
var/description //Description of this gear. If left blank will default to the description of the pathed item.
- var/path //Path to item.
+ var/atom/path //Path to item.
+ var/icon_state //Icon state of item
+ var/icon //File of icon
+ var/base64icon //It will be generated automaticly
var/cost = 1 //Number of points used. Items in general cost 1 point, storage/armor/gloves/special use costs 2 points.
var/slot //Slot to equip to.
var/list/allowed_roles //Roles that can spawn with this item.
@@ -380,8 +394,7 @@ var/list/gear_datums = list()
if(HAS_FLAGS(flags, GEAR_HAS_TYPE_SELECTION|GEAR_HAS_SUBTYPE_SELECTION))
CRASH("May not have both type and subtype selection tweaks")
if(!description)
- var/obj/O = path
- description = initial(O.desc)
+ description = initial(path.desc)
if(flags & GEAR_HAS_COLOR_SELECTION)
gear_tweaks += gear_tweak_free_color_choice()
if(flags & GEAR_HAS_TYPE_SELECTION)
@@ -390,6 +403,16 @@ var/list/gear_datums = list()
gear_tweaks += new/datum/gear_tweak/path/subtype(path)
if(custom_setup_proc)
gear_tweaks += new/datum/gear_tweak/custom_setup(custom_setup_proc)
+ update_icon()
+
+/datum/gear/proc/update_icon(var/color)
+ if(!initial(icon) || !initial(icon_state))
+ icon_state = initial(path.icon_state)
+ icon = initial(path.icon)
+ var/icon/item_icon = icon(icon, icon_state, SOUTH, 1, FALSE)
+ if(color)
+ item_icon.ColorTone(color)
+ base64icon = icon2base64(item_icon)
/datum/gear/proc/get_description(var/metadata)
. = description
diff --git a/html/browser/common.css b/html/browser/common.css
index 732e6551eb..8a60645a4f 100644
--- a/html/browser/common.css
+++ b/html/browser/common.css
@@ -353,4 +353,12 @@ a.donate:hover
color: #00aa88 !important;
border-color: #00aa88 !important;
}
+
+.loadoutPreview
+{
+ -ms-interpolation-mode: nearest-neighbor;
+ width: 64px;
+ height:64px;
+}
+
/* [/INF] */
diff --git a/infinity/code/modules/client/preference_setup/loadout/lists/armor.dm b/infinity/code/modules/client/preference_setup/loadout/lists/armor.dm
index 7add135035..7be9fa561d 100644
--- a/infinity/code/modules/client/preference_setup/loadout/lists/armor.dm
+++ b/infinity/code/modules/client/preference_setup/loadout/lists/armor.dm
@@ -1,6 +1,6 @@
/datum/gear/tactical/bloodpatch
display_name = "blood patch selection"
- path = /obj/item/clothing/accessory/armor/tag
+ path = /obj/item/clothing/accessory/armor/tag/abpos
allowed_roles = list(/datum/job/detective, /datum/job/officer, /datum/job/hos)
/datum/gear/tactical/bloodpatch/New()
@@ -52,7 +52,7 @@
/datum/gear/tactical/armor_deco
display_name = "armor tags selection"
- path = /obj/item/clothing/accessory/armor/tag
+ path = /obj/item/clothing/accessory/armor/tag/nt
allowed_roles = list(/datum/job/detective, /datum/job/officer, /datum/job/hos)
/datum/gear/tactical/armor_deco/New()
diff --git a/infinity/code/modules/client/preference_setup/loadout/lists/infinity.dm b/infinity/code/modules/client/preference_setup/loadout/lists/infinity.dm
index fbd33328cb..5b82862a69 100644
--- a/infinity/code/modules/client/preference_setup/loadout/lists/infinity.dm
+++ b/infinity/code/modules/client/preference_setup/loadout/lists/infinity.dm
@@ -4,7 +4,7 @@
/datum/gear/accessory/collar
display_name = "collar selection"
- path = /obj/item/clothing/accessory/necklace/collar
+ path = /obj/item/clothing/accessory/necklace/collar/gold
/datum/gear/accessory/collar/New()
..()
@@ -49,7 +49,7 @@
/datum/gear/uniform/pmc //Please don't dublicate it in maps anymore, ok?
display_name = "PMC uniform selection"
allowed_roles = list(/datum/job/detective, /datum/job/officer, /datum/job/hos)
- path = /obj/item/clothing/under
+ path = /obj/item/clothing/under/pcrcsuit
/datum/gear/uniform/pmc/New()
..()
@@ -69,7 +69,7 @@
*/
/datum/gear/uniform/corpsi
display_name = "corporate uniform selection"
- path = /obj/item/clothing/under
+ path = /obj/item/clothing/under/mbill
/datum/gear/uniform/corpsi/New()
..()
diff --git a/infinity/code/modules/client/preference_setup/loadout/lists/xenowear.dm b/infinity/code/modules/client/preference_setup/loadout/lists/xenowear.dm
index 08e79be7cd..6ad1e4b955 100644
--- a/infinity/code/modules/client/preference_setup/loadout/lists/xenowear.dm
+++ b/infinity/code/modules/client/preference_setup/loadout/lists/xenowear.dm
@@ -50,7 +50,7 @@
/datum/gear/uniform/thermal
sort_category = "Xenowear"
display_name = "thermal suit selection"
- path = /obj/item/clothing/under
+ path = /obj/item/clothing/under/thermal/tajara/black
whitelisted = list(SPECIES_TAJARA, SPECIES_RESOMI)
/datum/gear/uniform/thermal/New()
diff --git a/maps/sierra/loadout/loadout_accessories.dm b/maps/sierra/loadout/loadout_accessories.dm
index f8ba00da3a..768fe2102f 100644
--- a/maps/sierra/loadout/loadout_accessories.dm
+++ b/maps/sierra/loadout/loadout_accessories.dm
@@ -55,7 +55,7 @@
/datum/gear/accessory/solgov_ec_rank
display_name = "Expeditionary Corps rank badges selection"
description = "An insignia denoting wearer's rank within the SCG Expeditionary Corps."
- path = /obj/item/clothing/accessory
+ path = /obj/item/clothing/accessory/solgov/rank/ec/enlisted
allowed_branches = list(/datum/mil_branch/contractor)
allowed_backgrounds = list(FACTION_SOL_CENTRAL, FACTION_EXPEDITIONARY, FACTION_CORPORATE)
diff --git a/maps/sierra/loadout/loadout_head.dm b/maps/sierra/loadout/loadout_head.dm
index 685809f9eb..622381ca3b 100644
--- a/maps/sierra/loadout/loadout_head.dm
+++ b/maps/sierra/loadout/loadout_head.dm
@@ -15,7 +15,7 @@
/datum/gear/head/beret_selection
display_name = "contractor beret selection"
description = "A list of berets used by various organizations and corporights."
- path = /obj/item/clothing/head/beret
+ path = /obj/item/clothing/head/beret/sec/corporate/pcrc
allowed_roles = SECURITY_ROLES
/datum/gear/head/beret_selection/New()
@@ -27,4 +27,3 @@
beret_selection_type["PCRC beret"] = /obj/item/clothing/head/beret/sec/corporate/pcrc
beret_selection_type["ZPCI beret"] = /obj/item/clothing/head/beret/sec/corporate/zpci
gear_tweaks += new/datum/gear_tweak/path(beret_selection_type)
-
diff --git a/maps/sierra/loadout/loadout_suit.dm b/maps/sierra/loadout/loadout_suit.dm
index 76ecab99b2..78112e23d7 100644
--- a/maps/sierra/loadout/loadout_suit.dm
+++ b/maps/sierra/loadout/loadout_suit.dm
@@ -60,7 +60,7 @@
/datum/gear/suit/labcoat_corp_si
display_name = "labcoat, NT or Hephaestus"
- path = /obj/item/clothing/suit/storage/toggle/labcoat/science
+ path = /obj/item/clothing/suit/storage/toggle/labcoat/science/nanotrasen
allowed_roles = RESEARCH_ROLES
allowed_branches = list(/datum/mil_branch/employee, /datum/mil_branch/contractor)
diff --git a/maps/sierra/loadout/loadout_tactical.dm b/maps/sierra/loadout/loadout_tactical.dm
index fa1ea81bc3..4c8f1a55f9 100644
--- a/maps/sierra/loadout/loadout_tactical.dm
+++ b/maps/sierra/loadout/loadout_tactical.dm
@@ -45,7 +45,7 @@
/datum/gear/tactical/security_uniforms
display_name = "security uniform"
allowed_roles = SECURITY_ROLES
- path = /obj/item/clothing/under
+ path = /obj/item/clothing/under/rank/security/corp/alt
slot = slot_w_uniform
/datum/gear/tactical/security_uniforms/New()
@@ -61,4 +61,3 @@
path = /obj/item/clothing/under/gray_camo
slot = slot_w_uniform
flags = GEAR_HAS_COLOR_SELECTION
-
diff --git a/maps/sierra/loadout/loadout_uniform.dm b/maps/sierra/loadout/loadout_uniform.dm
index 79bb12b240..f49bfabfa0 100644
--- a/maps/sierra/loadout/loadout_uniform.dm
+++ b/maps/sierra/loadout/loadout_uniform.dm
@@ -22,14 +22,14 @@
path = /obj/item/clothing/under/rank/guard/nanotrasen
allowed_roles = list(/datum/job/officer)
-/datum/gear/uniform/si_exec
- display_name = "NanoTrasen senior researcher alt uniform"
- path = /obj/item/clothing/under/rank/scientist/executive
- allowed_roles = list(/datum/job/senior_scientist)
+// /datum/gear/uniform/si_exec
+// display_name = "NanoTrasen senior researcher alt uniform"
+// path = /obj/item/clothing/under/rank/scientist/executive
+// allowed_roles = list(/datum/job/senior_scientist) спрайта нема
/datum/gear/uniform/si_overalls
display_name = "corporate coveralls"
- path = /obj/item/clothing/under/rank/ntwork
+ path = /obj/item/clothing/under/rank/ntwork/heph
allowed_branches = list(/datum/mil_branch/employee, /datum/mil_branch/contractor)
/datum/gear/uniform/si_overalls/New()
@@ -41,7 +41,7 @@
/datum/gear/uniform/si_flight
display_name = "corporate pilot suit"
- path = /obj/item/clothing/under/rank/ntpilot
+ path = /obj/item/clothing/under/rank/ntpilot/nanotrasen
allowed_branches = list(/datum/mil_branch/employee, /datum/mil_branch/contractor)
/datum/gear/uniform/si_flight/New()
@@ -58,7 +58,7 @@
/datum/gear/uniform/formal_shirt_and_pants
display_name = "formal shirts with pants"
- path = /obj/item/clothing/under/suit_jacket
+ path = /obj/item/clothing/under/suit_jacket/charcoal/no_accessories
/datum/gear/uniform/formal_shirt_and_pants/New()
..()
diff --git a/maps/sierra/loadout/loadout_xeno.dm b/maps/sierra/loadout/loadout_xeno.dm
index 5244a02fd6..f1aa2eed3b 100644
--- a/maps/sierra/loadout/loadout_xeno.dm
+++ b/maps/sierra/loadout/loadout_xeno.dm
@@ -2,7 +2,7 @@
/datum/gear/passport/unathi
display_name = "(Unathi) registration document"
- path = /obj/item/passport/xeno/unathi
+ path = /obj/item/passport/xeno/unathi/independent
sort_category = "Xenowear"
flags = 0
whitelisted = list(SPECIES_UNATHI, SPECIES_YEOSA)
diff --git a/maps/torch/loadout/loadout_accessories.dm b/maps/torch/loadout/loadout_accessories.dm
index b6f18f5c8a..5b9d59bccd 100644
--- a/maps/torch/loadout/loadout_accessories.dm
+++ b/maps/torch/loadout/loadout_accessories.dm
@@ -1,7 +1,7 @@
/datum/gear/accessory/solawardmajor
display_name = "SolGov major award selection"
description = "A medal or ribbon awarded to SolGov personnel for significant accomplishments."
- path = /obj/item/clothing/accessory
+ path = /obj/item/clothing/accessory/medal/solgov/bronze/heart
cost = 8
allowed_branches = SOLGOV_BRANCHES
@@ -21,7 +21,7 @@
/datum/gear/accessory/solawardminor
display_name = "SolGov minor award selection"
description = "A medal or ribbon awarded to SolGov personnel for minor accomplishments."
- path = /obj/item/clothing/accessory
+ path = /obj/item/clothing/accessory/medal/solgov/iron/sol
cost = 5
allowed_branches = SOLGOV_BRANCHES
@@ -216,7 +216,7 @@
/datum/gear/tactical/ubac/misc
display_name = "miscellaneous UBAC shirt selection"
- path = /obj/item/clothing/accessory/ubac
+ path = /obj/item/clothing/accessory/ubac/green
allowed_branches = CIVILIAN_BRANCHES
/datum/gear/tactical/ubac/misc/New()
@@ -239,7 +239,7 @@
/datum/gear/tactical/armor_pouches/misc
display_name = "miscellaneous armor pouches selection"
- path = /obj/item/clothing/accessory/storage/pouches
+ path = /obj/item/clothing/accessory/storage/pouches/green
allowed_branches = CIVILIAN_BRANCHES
/datum/gear/tactical/armor_pouches/misc/New()
@@ -262,7 +262,7 @@
/datum/gear/tactical/large_pouches/misc
display_name = "miscellaneous large armor pouches selection"
- path = /obj/item/clothing/accessory/storage/pouches/large
+ path = /obj/item/clothing/accessory/storage/pouches/large/green
allowed_branches = CIVILIAN_BRANCHES
/datum/gear/tactical/large_pouches/misc/New()
diff --git a/maps/torch/loadout/loadout_suit.dm b/maps/torch/loadout/loadout_suit.dm
index c74e68c53b..89ea32fb53 100644
--- a/maps/torch/loadout/loadout_suit.dm
+++ b/maps/torch/loadout/loadout_suit.dm
@@ -113,6 +113,7 @@
/datum/gear/tactical/pcarrier/misc
display_name = "miscellaneous plate carrier selection"
+ path = /obj/item/clothing/suit/armor/pcarrier/green
allowed_roles = ARMORED_ROLES
allowed_branches = CIVILIAN_BRANCHES
|
