cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 18:44:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updates Merchants Fluff item.

Browse Source
This commit is contained in:
TravellingMerchant
2018-05-04 16:33:00 +01:00
committed by GitHub
parent 7296f7d754
commit e812cae73f
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/customitems/item_defines.dm
+24 -24
View File
@@ -497,8 +497,8 @@
#undef USED_MOD_SUIT
/obj/item/fluff/merchant_sallet_modkit //Travelling Merchant: Trav Noble. This is what they spawn in with
name = "sallet modkit"
desc = "A modkit that can make most helmets look like a steel sallet."
name = "SG Helmet modkit"
desc = "A modkit that can make most helmets look like a Shellguard Helmet."
icon_state = "modkit"
w_class = WEIGHT_CLASS_SMALL
force = 0
@@ -649,49 +649,49 @@
icon_state = "kakicharakiti"
/obj/item/clothing/head/helmet/fluff/merchant_sallet //Travelling Merchant: Trav Noble. This >>IS NOT<< what they spawn in with
name = "Steel Sallet"
desc = "A heavy steel sallet with the word Noble scratched into the side. Comes with a Bevor attached."
name = "Shellguard Helmet"
desc = "A Shellguard Helmet with the name Noble written on the inside."
icon = 'icons/obj/custom_items.dmi'
icon_state = "merchant_sallet_visor_bevor"
item_state = "merchant_sallet_visor_bevor"
actions_types = list(/datum/action/item_action/toggle_helmet_mode)
toggle_cooldown = 20
toggle_sound = 'sound/items/ZippoClose.ogg'
toggle_sound = 'sound/items/change_jaws.ogg'
flags = BLOCKHAIR
flags_inv = HIDEEYES|HIDEMASK|HIDEFACE|HIDEEARS
var/state = "Visor & Bevor"
var/state = "Soldier Up"
/obj/item/clothing/head/helmet/fluff/merchant_sallet/attack_self(mob/user)
if(!user.incapacitated() && (world.time > cooldown + toggle_cooldown) && Adjacent(user))
var/list/options = list()
options["Visor & Bevor"] = list(
options["Soldier Up"] = list(
"icon_state" = "merchant_sallet_visor_bevor",
"visor_flags" = HIDEEYES,
"mask_flags" = HIDEMASK|HIDEFACE
)
options["Visor Only"] = list(
"icon_state" = "merchant_sallet_visor",
"visor_flags" = HIDEEYES,
"mask_flags" = HIDEFACE
)
options["Bevor Only"] = list(
"icon_state" = "merchant_sallet_bevor",
"visor_flags" = null,
"mask_flags" = HIDEMASK|HIDEFACE
)
options["Neither Visor nor Bevor"] = list(
"icon_state" = "merchant_sallet",
"visor_flags" = null,
"mask_flags" = null
)
options["Soldier Down"] = list(
"icon_state" = "merchant_sallet_visor",
"visor_flags" = HIDEEYES,
"mask_flags" = HIDEMASK|HIDEFACE
)
options["Technician Up"] = list(
"icon_state" = "merchant_sallet_bevor",
"visor_flags" = null,
"mask_flags" = null
)
options["Technician Down"] = list(
"icon_state" = "merchant_sallet",
"visor_flags" = HIDEEYES,
"mask_flags" = HIDEMASK|HIDEFACE
)
var/choice = input(user, "How would you like to adjust the sallet?", "Adjust Sallet") as null|anything in options
var/choice = input(user, "How would you like to adjust the helmet?", "Adjust Helmet") as null|anything in options
if(choice && choice != state && !user.incapacitated() && Adjacent(user))
var/list/new_state = options[choice]
icon_state = new_state["icon_state"]
state = choice
to_chat(user, "You adjust the sallet.")
to_chat(user, "You adjust the helmet.")
playsound(src.loc, "[toggle_sound]", 100, 0, 4)
user.update_inv_head()
return 1