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

Updates a couple of /obj/item variables (#29829)

Browse Source 
* compiles checkpoint

* fix some

* updatepaths

* fix

* rrr

* linters

* fiexs

* icon fixes

* plasmemes

* fix

* fix

* fix bit more

* fix

* well

* cleanup

* fix glasses layer

* conflict

* fuck gun code

* fixes

* fix

* fixes to energy guns

* review

* conflict

* support that 1 unathi pixel

* fix
This commit is contained in:
kyunkyunkyun
2025-09-14 15:23:56 +00:00
committed by GitHub
parent 500c6b16fe
commit 8821ab9a66
418 changed files with 1750 additions and 3810 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/customitems/item_defines.dm
+56 -107
View File
@@ -1,6 +1,6 @@
// Add custom items you give to people here, and put their icons in custom_items.dmi
// Remember to change 'icon = 'custom_items.dmi'' for items not using /obj/item/fluff as a base
// Clothing item_state doesn't use custom_items.dmi. Just add them to the normal clothing files.
// If you add an inhand icon state, add it to the 'icons/mob/inhands/fluff_lefthand.dmi' and 'icons/mob/inhands/fluff_righthand.dmi' and redeclare `lefthand_file` and `righthand_file`
///////////////////////////////////////////////////////////////////////
/////////////////////PARADISE STATION CUSTOM ITEMS/////////////////////
@@ -21,6 +21,10 @@
/obj/item/clothing/suit/hooded/fluff
w_class = WEIGHT_CLASS_SMALL
/obj/item/storage/backpack/fluff
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
/// Generic tattoo gun, make subtypes for different folks
/obj/item/fluff/tattoo_gun
name = "disposable tattoo pen"
@@ -152,7 +156,6 @@
desc = "A shimmering ceremonial golden katana, for the most discerning class of ninja. Looks expensive, and fragile."
icon = 'icons/obj/custom_items.dmi'
icon_state = "rsik_katana"
item_state = "rsik_katana"
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
force = 5
@@ -172,6 +175,7 @@
desc = "A pink crowbar that has an engraving that reads, 'To Zelda. Love always, Dawn'"
icon = 'icons/obj/custom_items.dmi'
icon_state = "zeldacrowbar"
inhand_icon_state = "crowbar"
/// Trubus: Wolf O'Shaw
/obj/item/clothing/glasses/monocle/fluff/trubus
@@ -228,28 +232,28 @@
name = "purple engraved zippo"
desc = "All craftsspacemanship is of the highest quality. It is encrusted with refined plasma sheets. On the item is an image of a dwarf and the words 'Strike the Earth!' etched onto the side."
icon_state = "zippo-purple"
item_state = "zippo-purple"
inhand_icon_state = "zippo-purple"
/// mrbits: Callista Gold
/obj/item/lighter/zippo/fluff/michael_guess_1
name = "engraved lighter"
desc = "A golden lighter, engraved with some ornaments and a G."
icon_state = "zippo-guess"
item_state = "zippo-gold"
inhand_icon_state = "zippo-gold"
/// Duckchan: Rybys Romney
/obj/item/lighter/zippo/fluff/duckchan
name = "Monogrammed Zippo"
desc = "A shiny purple zippo lighter, engraved with Rybys Romney and BuzzPing's name, with a festive green flame."
icon_state = "zippo-duckchan"
item_state = "zippo-purple"
inhand_icon_state = "zippo-purple"
/// Warriorstar: DEADLOCK
/obj/item/lighter/zippo/fluff/warriorstar
name = "zippo"
desc = "The lighter is made of a pastel purple metal which seems to glimmer even in complete darkness."
icon_state = "zippo-warriorstar"
item_state = "zippo-purple"
inhand_icon_state = "zippo-purple"
/// phantasmicdream: Zeke Varloss
/obj/item/fluff/dogwhistle
@@ -257,7 +261,6 @@
desc = "This whistle seems to have a strange aura about it. Maybe you should blow on it?"
icon = 'icons/obj/custom_items.dmi'
icon_state = "dogwhistle"
item_state = "dogwhistle"
force = 2
/obj/item/fluff/dogwhistle/attack_self__legacy__attackchain(mob/user)
@@ -282,7 +285,6 @@
desc = "A simple black lunchpail."
icon = 'icons/obj/custom_items.dmi'
icon_state = "lunch_box"
item_state = "lunch_box"
force = 5
throwforce = 5
w_class = WEIGHT_CLASS_NORMAL
@@ -389,9 +391,8 @@
if(istype(target, /obj/item/melee/baton) && !istype(target, /obj/item/melee/baton/cattleprod))
to_chat(user, "<span class='notice'>You modify the appearance of [target].</span>")
var/obj/item/melee/baton/the_baton = target
the_baton.base_icon = "desolate_baton"
the_baton.item_state = "desolate_baton"
the_baton.icon = 'icons/obj/custom_items.dmi'
the_baton.base_icon = "desolate_baton"
the_baton.lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
the_baton.righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
the_baton.update_icon()
@@ -512,7 +513,7 @@
P.desc = "A rare winterised variant of the security hardsuit helmet, used on colder mining worlds for security patrols."
P.icon = 'icons/obj/custom_items.dmi'
P.icon_state = "hardsuit0-secf"
P.item_state = "hardsuit0-secf"
P.inhand_icon_state = "hardsuit0-secf"
P.sprite_sheets = null
P.item_color = "secf"
user.update_icons()
@@ -532,7 +533,7 @@
P.desc = "A rare winterised variant of the security hardsuit, used on colder mining worlds for securiry patrols, this one has 'Haliber' written on an ID patch located on the right side of the chest."
P.icon = 'icons/obj/custom_items.dmi'
P.icon_state = "hardsuit-secf"
P.item_state = "hardsuit-secf"
P.inhand_icon_state = "hardsuit-secf"
P.sprite_sheets = null
user.update_icons()
@@ -566,7 +567,7 @@
P.desc = "A special helmet that protects against hazardous, low pressure environments. Has an additional layer of armor and rigging for combat duty."
P.icon = 'icons/obj/custom_items.dmi'
P.icon_state = "hardsuit0-secc"
P.item_state = "hardsuit0-secc"
P.inhand_icon_state = "hardsuit0-secc"
P.sprite_sheets = null
P.item_color = "secc"
user.update_icons()
@@ -589,7 +590,7 @@
P.desc = "A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor and rigging for combat duty"
P.icon = 'icons/obj/custom_items.dmi'
P.icon_state = "hardsuit-secc"
P.item_state = "hardsuit-secc"
P.inhand_icon_state = "hardsuit-secc"
P.sprite_sheets = null
user.update_icons()
@@ -615,7 +616,6 @@
desc = "Tacticool ballistic glasses, for making all operators look badass."
icon = 'icons/obj/custom_items.dmi'
icon_state = "eyepro"
item_state = "eyepro"
/// LP Spartan: Kaskreyarawkta
/obj/item/clothing/glasses/hud/security/sunglasses/fluff/voxxyhud
@@ -631,7 +631,6 @@
desc= "A beautiful purple rose for your hair."
icon= 'icons/obj/custom_items.dmi'
icon_state = "hairflowerp"
item_state = "hairflowerp"
/// R3Valkyrie: Rikki
/obj/item/clothing/head/valkyriehelmet
@@ -653,7 +652,6 @@
name = "Lieutenant Starsong's beret"
desc = "This beret bears insignia of the SOLGOV Marine Corps 417th Regiment, 2nd Battalion, Bravo Company. It looks meticulously maintained."
icon_state = "beret_hos"
item_state = "beret_hos"
/// MrFroztee: Stumpy
/obj/item/clothing/head/pirate/fluff/stumpy
@@ -694,7 +692,6 @@
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/change_jaws.ogg'
@@ -757,7 +754,7 @@
desc = "An EMT labcoat modified to track the wearer's heartbeat. It's so worn out that it doesn't seem to accurately track heartbeat anymore. Also, the zipper is stuck."
icon = 'icons/obj/custom_items.dmi'
icon_state = "pulsecoat"
item_state = "pulsecoat"
inhand_icon_state = null
ignore_suitadjust = 1
actions_types = list()
@@ -820,7 +817,6 @@
/obj/item/clothing/suit/fluff/cheeky_sov_coat
name = "Srusu's Greatcoat"
desc = "A heavy wool Soviet-style greatcoat. A name is written in fancy handwriting on the inside tag: Srusu Rskuzu"
item_state = "cheeky_sov_coat"
icon_state = "cheeky_sov_coat"
/// Denthamos: Henry Grandpa Gadow
@@ -828,7 +824,6 @@
name = "faded NT Supply Master's Coat"
desc = "A faded leather overcoat bearing a worn out badge from the NAS Crescent on the shoulder, and a designation tag of Supply Master on the front. A tarnished gold nameplate says H.Gadow on it."
icon_state = "supplymaster_jacket_open"
item_state = "supplymaster_jacket_open"
ignore_suitadjust = 0
suit_adjusted = 1
allowed = list(/obj/item/flashlight,/obj/item/tank/internals/emergency_oxygen,/obj/item/toy,/obj/item/storage/fancy/cigarettes,/obj/item/lighter)
@@ -851,7 +846,7 @@
desc = "A rugged leather vest with a tag labelled \"Men of Mayhem.\""
icon = 'icons/obj/custom_items.dmi'
icon_state = "kidosvest"
item_state = "kidosvest"
inhand_icon_state = "armor"
ignore_suitadjust = 1
actions_types = list()
adjust_flavour = null
@@ -873,7 +868,6 @@
name = "Nano Fibre Jacket"
desc = "A Black Suit made out of nanofibre. The newest of cyberpunk fashion using hightech liquid to solid materials."
icon_state = "Kluysfluff1"
item_state = "Kluysfluff1"
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|ARMS
@@ -964,18 +958,20 @@
name = "SHODAN's Captain's Coat"
desc = "A black coat with gold trim and an old US Chevron printed on the back. Edgy."
icon = 'icons/obj/custom_items.dmi'
icon_state = "shodancoat"
item_state = "shodancoat_item"
icon_state = "shodancoat_item"
worn_icon_state = "shodancoat"
/obj/item/clothing/suit/storage/fluff/k3_webbing
name = "vox tactical webbing"
desc = "A somewhat worn but well kept set of vox tactical webbing. It has a couple of pouches attached."
icon = 'icons/obj/custom_items.dmi'
icon_state = "k3_webbing"
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
inhand_icon_state = "webbing"
lefthand_file = 'icons/mob/inhands/equipment/belt_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/belt_righthand.dmi'
ignore_suitadjust = 0
actions_types = list(/datum/action/item_action/toggle)
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
/obj/item/clothing/suit/storage/fluff/k3_webbing/adjustsuit(mob/user)
if(!user.incapacitated())
@@ -983,12 +979,10 @@
if(suit_adjusted)
flavour = "off"
icon_state = copytext(icon_state, 1, findtext(icon_state, "_on"))
item_state = copytext(item_state, 1, findtext(item_state, "_on"))
suit_adjusted = 0 //Lights Off
else
flavour = "on"
icon_state += "_on"
item_state += "_on"
suit_adjusted = 1 //Lights On
update_action_buttons()
@@ -1004,7 +998,6 @@
hoodtype = /obj/item/clothing/head/hooded/hood/fluff/xantholne
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
/// Xantholne: Meex Zwichsnicrur
/obj/item/clothing/head/hooded/hood/fluff/xantholne
name = "black winter hood"
@@ -1059,7 +1052,6 @@
desc = "A custom made winter coat with the arms removed. Looks comfy."
icon = 'icons/obj/custom_items.dmi'
icon_state = "shesicoat"
item_state = "shesicoat"
hoodtype = /obj/item/clothing/head/hooded/hood/fluff/shesi
body_parts_covered = UPPER_TORSO|LOWER_TORSO
cold_protection = UPPER_TORSO|LOWER_TORSO
@@ -1077,7 +1069,6 @@
desc = "Looks like something only a nerd would buy. Has a tag inside reading <i>Property of DTX</i>."
icon = 'icons/obj/custom_items.dmi'
icon_state = "dtxbomber"
item_state = "dtxbomber"
allowed = list(/obj/item/flashlight,/obj/item/tank/internals/emergency_oxygen,/obj/item/toy,/obj/item/storage/fancy/cigarettes,/obj/item/lighter)
actions_types = list(/datum/action/item_action/zipper)
sprite_sheets = null
@@ -1085,22 +1076,21 @@
//////////// Uniforms ////////////
/obj/item/clothing/under/fluff
worn_icon = 'icons/mob/clothing/under/donator.dmi'
sprite_sheets = list(
"Human" = 'icons/mob/clothing/under/donator.dmi',
"Vox" = 'icons/mob/clothing/species/vox/under/donator.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/donator.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/donator.dmi'
)
)
/// thatdanguy23 : Rissa Williams
/obj/item/clothing/under/fluff/counterfeitguise_uniform
icon = 'icons/obj/custom_items.dmi'
name = "Rissa's hand-me-downs"
desc = "An old, hand-me-down baggy sweater and sweatpants combo. A label on the neck reads 'RISSA' in scruffy handwriting."
icon = 'icons/obj/custom_items.dmi'
icon_state = "counterfeitguise" // doesn't exist
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
icon_state = "counterfeitguise"
item_state = "counterfeitguise"
item_color = "counterfeitguise"
/// Benjaminfallout: Pretzel Brassheart
@@ -1109,7 +1099,6 @@
name = "Pretzel's dress"
desc = "A nice looking dress."
icon_state = "fallout_dress"
item_state = "fallout_dress"
item_color = "fallout_dress"
/// Norstead : Natalya Sokolova
@@ -1118,7 +1107,6 @@
name = "Soviet Casual Uniform"
desc = "Female U.S.S.P. casual wear. Dlya Rodiny!"
icon_state = "soviet_casual_uniform"
item_state = "soviet_casual_uniform"
item_color = "soviet_casual_uniform"
/// Kharshai: Athena Castile
@@ -1127,7 +1115,6 @@
desc = "A white and gold formal uniform, accompanied by a small pin with the numbers '004' etched upon it."
icon = 'icons/obj/custom_items.dmi'
icon_state = "castile_dress"
item_state = "castile_dress"
item_color = "castile_dress"
/// Xantholne: Meex Zwichsnicrur
@@ -1135,10 +1122,9 @@
name = "Stripped Shorts and Shirt"
desc = "A silky pair of dark shorts with a matching shirt. The shirt's collar has a tag on the inside that reads 'Meexy' on it."
icon = 'icons/obj/custom_items.dmi'
icon_state = "xantholne"
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
icon_state = "xantholne"
item_state = "xantholne"
item_color = "xantholne"
/// FlattestGuitar9: Eli Randolph
@@ -1147,7 +1133,7 @@
desc = "A soft, white dress shirt paired up with black suit pants. The set looks comfortable."
icon = 'icons/obj/custom_items.dmi'
icon_state = "elishirt"
item_state = "elishirt"
inhand_icon_state = "ba_suit"
item_color = "elishirt"
displays_id = FALSE
@@ -1157,7 +1143,7 @@
desc = "It seems to be lightly dusted in orange fuzz, and damp with the smell of anti-freeze. It has a strange symbol in the middle."
icon = 'icons/obj/custom_items.dmi'
icon_state = "jaywingler"
item_state = "jaywingler"
inhand_icon_state = "bl_suit"
item_color = "jaywingler"
displays_id = FALSE
@@ -1172,7 +1158,7 @@
desc = "A Nanotrasen Synthetic Intelligence Division jumpsuit, issued to 'volunteers'. On other people it looks fine, but right here a scientist has noted: on you it looks stupid."
icon = 'icons/obj/custom_items.dmi'
icon_state = "jane_sid_suit"
item_state = "jane_sid_suit"
inhand_icon_state = "gy_suit"
item_color = "jane_sid_suit"
has_sensor = 2
sensor_mode = SENSOR_COORDS
@@ -1192,7 +1178,6 @@
to_chat(usr, "You unzip and roll down \the [src].")
src.icon_state = "[item_color]"
src.item_state = "[item_color]"
usr.update_inv_w_uniform()
/// MrBarrelrolll: Maximus Greenwood
@@ -1201,7 +1186,7 @@
desc = "A set of chainmail adorned with a hide mantle. \"Greenwood\" is engraved into the right breast."
icon = 'icons/obj/clothing/under/costumes.dmi'
icon_state = "roman"
item_state = "maximus_armor"
inhand_icon_state = "armor"
item_color = "maximus_armor"
displays_id = FALSE
strip_delay = 100
@@ -1211,10 +1196,10 @@
name = "gilded waistcoat"
desc = "This black, gold-trimmed, rather expensive-looking uniform laced with fine materials appears comfortable despite its stiffness."
icon = 'icons/obj/custom_items.dmi'
icon_state = "aegisuniform"
inhand_icon_state = "aegisuniform"
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
icon_state = "aegisuniform"
item_state = "aegisuniform"
item_color = "aegisuniform"
displays_id = FALSE
@@ -1242,7 +1227,6 @@
desc = "Designed to cover as little of face as possible while still being a functional gasmask."
icon = 'icons/obj/custom_items.dmi'
icon_state = "spartan_mask"
item_state = "spartan_mask"
species_restricted = list("Vox")
//////////// Shoes ////////////
@@ -1254,7 +1238,6 @@
desc = "An aviator styled jacket made from a peculiar material; this one seems very old."
icon = 'icons/obj/custom_items.dmi'
icon_state = "fox_jacket"
item_state = "fox_jacket"
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/projectile/automatic/pistol, /obj/item/gun/projectile/revolver, /obj/item/gun/energy/detective)
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
@@ -1265,7 +1248,7 @@
desc = "A jumpsuit tailor made for spacefaring fighter pilots; this one seems very old."
icon = 'icons/obj/custom_items.dmi'
icon_state = "fox_suit"
item_state = "g_suit"
inhand_icon_state = "g_suit"
item_color = "fox_suit"
displays_id = FALSE //still appears on examine; this is pure fluff.
@@ -1310,7 +1293,6 @@
desc = "It's what an evil genius would design if he switched brains with the Amazing Arachno-Man. Actually, he'd probably add weird tentacles that come out the back, too."
icon = 'icons/obj/clothing/under/donator.dmi'
icon_state = "superior_suit"
item_state = "superior_suit"
item_color = "superior_suit"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
flags_inv = HIDEGLOVES|HIDESHOES
@@ -1320,7 +1302,6 @@
desc = "Put it on. The mask, it's gonna make you stronger!"
icon = 'icons/obj/custom_items.dmi'
icon_state = "superior_mask"
item_state = "superior_mask"
flags = BLOCKHAIR
flags_inv = HIDEFACE
@@ -1329,7 +1310,6 @@
desc = "These boots were made for crawlin'."
icon = 'icons/obj/custom_items.dmi'
icon_state = "superior_boots"
item_state = "superior_boots"
/// chronx100: Hughe O'Splash
/obj/item/nullrod/fluff/chronx
@@ -1340,7 +1320,7 @@
desc = "An ancient scythe used by the worshipers of Cthulhu. Tales say it is used to prepare souls for Cthulhu's great devouring. Someone carved their name into the handle: Hughe O'Splash"
icon = 'icons/obj/custom_items.dmi'
icon_state = "chronx_scythe"
item_state = "chronx_scythe"
inhand_icon_state = "chronx_scythe"
/// chronx100: Hughe O'Splash
/obj/item/clothing/head/fluff/chronx
@@ -1348,7 +1328,6 @@
desc = "Hood worn by the worshipers of Cthulhu. You see a name inscribed in blood on the inside: Hughe O'Splash"
icon = 'icons/obj/custom_items.dmi'
icon_state = "chronx_hood"
item_state = "chronx_hood"
flags = BLOCKHAIR
flags_cover = HEADCOVERSEYES
actions_types = list(/datum/action/item_action/toggle)
@@ -1360,12 +1339,10 @@
/obj/item/clothing/head/fluff/chronx/proc/adjust()
if(adjusted)
icon_state = initial(icon_state)
item_state = initial(item_state)
to_chat(usr, "You untransform \the [src].")
adjusted = 0
else
icon_state += "_open"
item_state += "_open"
to_chat(usr, "You transform \the [src].")
adjusted = 1
usr.update_inv_head()
@@ -1377,7 +1354,7 @@
desc = "Robes worn by the worshipers of Cthulhu. You see a name inscribed in blood on the inside: Hughe O'Splash"
icon = 'icons/obj/custom_items.dmi'
icon_state = "chronx_robe"
item_state = "chronx_robe"
inhand_icon_state = "chronx_suit"
actions_types = list(/datum/action/item_action/toggle)
adjust_flavour = "untransform"
ignore_suitadjust = 0
@@ -1388,7 +1365,6 @@
desc = "Boots worn by the worshipers of Cthulhu. You see a name inscribed in blood on the inside: Hughe O'Splash"
icon = 'icons/obj/custom_items.dmi'
icon_state = "chronx_shoes"
item_state = "chronx_shoes"
/// m3hillus: Medusa Schlofield
/obj/item/clothing/suit/armor/vest/fluff/tactical
@@ -1396,7 +1372,6 @@
desc = "A tactical vest with armored plate inserts."
icon = 'icons/obj/clothing/accessories.dmi'
icon_state = "vest_black"
item_state = "vest_black"
sprite_sheets = null
/obj/item/clothing/under/pants/fluff/combat
@@ -1404,13 +1379,13 @@
desc = "Medium style tactical pants, for the fashion aware combat units out there."
icon = 'icons/mob/clothing/under/donator.dmi'
icon_state = "combat_pants_s"
worn_icon = 'icons/mob/clothing/under/donator.dmi'
item_color = "combat_pants"
sprite_sheets = list(
"Human" = 'icons/mob/clothing/under/donator.dmi',
"Vox" = 'icons/mob/clothing/species/vox/under/donator.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/donator.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/donator.dmi'
)
)
/// DaveTheHeadcrab: Elliot Campbell
/obj/item/clothing/suit/jacket/fluff/elliot_windbreaker
@@ -1418,7 +1393,6 @@
desc = "A cheap nylon windbreaker, according to the tag it was manufactured in New Chiba, Earth.<br>The color reminds you of a television tuned to a dead channel."
icon = 'icons/obj/custom_items.dmi'
icon_state = "elliot_windbreaker_open"
item_state = "elliot_windbreaker_open"
suit_adjusted = 1
sprite_sheets = null
@@ -1428,7 +1402,6 @@
desc = "A well made satchel for military operations. Totally not made by an enemy corporation"
icon = 'icons/obj/custom_items.dmi'
icon_state = "rawk_satchel"
item_state = null
sprite_sheets = null
/// lizardzsi: Krichahka
@@ -1437,7 +1410,6 @@
desc = "Battered, Sol-made military radio backpack that had its speakers fried from playing Vox opera. The words 'Swift-Talon' are crudely scratched onto its side."
icon = 'icons/obj/custom_items.dmi'
icon_state = "voxcaster_fluff"
item_state = null
/// Ssscratches: Lasshy-Bot
/obj/item/storage/backpack/fluff/ssscratches_back
@@ -1445,7 +1417,6 @@
desc = "It's a backpack, but it's also a cat."
icon = 'icons/obj/custom_items.dmi'
icon_state = "ssscratches_backpack"
item_state = null
/// Greey: Korala Ice
/obj/item/storage/backpack/fluff/thebrew
@@ -1453,7 +1424,6 @@
desc = "Amber colored backpack resembling a long lost friend, a spirit long forgotten."
icon = 'icons/obj/custom_items.dmi'
icon_state = "greeyfluff"
item_state = "greeyfluff"
/// phantasmicdream : Dreamy Rockwall
/obj/item/clothing/head/wizard/fake/fluff/dreamy
@@ -1461,7 +1431,6 @@
desc = "A shapeshifting witch hat. A strange aura comes from it..."
icon = 'icons/obj/custom_items.dmi'
icon_state = "classic_witch"
item_state = "classic_witch"
/obj/item/clothing/head/wizard/fake/fluff/dreamy/attack_self__legacy__attackchain(mob/user)
var/list/options = list()
@@ -1512,7 +1481,6 @@
desc = "A locket with a orange gem set on the front, the picture inside seems to be of a Tajaran."
icon = 'icons/obj/custom_items.dmi'
icon_state = "fethasnecklace"
item_state = "fethasnecklace"
item_color = "fethasnecklace"
slot_flags = ITEM_SLOT_MASK | ITEM_SLOT_ACCESSORY
@@ -1524,7 +1492,6 @@
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
icon_state = "sheetcosmos"
item_state = "sheetcosmos"
item_color = "sheetcosmos"
/// Lightfire: Hyperion
@@ -1539,10 +1506,7 @@
name = "classy victorian suit"
desc = "A blue and black victorian suit with silver buttons, very fancy!"
icon = 'icons/obj/custom_items.dmi'
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
icon_state = "victorianlightfire"
item_state = "victorianvest"
item_color = "victorianlightfire"
displays_id = FALSE
@@ -1603,11 +1567,11 @@
name = "Honkinator5000"
desc = "This horn may look ridiculous but is the new hot item for clowns in the Clown Empire. It has a fine print on its side reading: Property of Prince Honktertong the IV"
icon = 'icons/obj/custom_items.dmi'
icon_state = "teri_horn"
inhand_icon_state = "teri_horn"
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
honk_sounds = list('sound/items/teri_horn.ogg' = 1)
icon_state = "teri_horn"
item_state = "teri_horn"
/// V-Force_Bomber: E.L.O.
/obj/item/clothing/accessory/medal/fluff/elo
@@ -1621,21 +1585,19 @@
/obj/item/clothing/suit/fluff/vetcoat
name = "Veteran Coat"
desc = "An old, yet well-kept Nanotrasen uniform. Very few of its kind are still produced."
icon_state = "alchemistcoatblack"
inhand_icon_state = "alchemistcoat"
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
icon_state = "alchemistcoatblack"
item_state = "alchemistcoatblack"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
/// Furasian: Fillmoore Grayson
/obj/item/clothing/suit/fluff/vetcoat/red
icon_state = "alchemistcoatred"
item_state = "alchemistcoatred"
/// Furasian: Fillmoore Grayson
/obj/item/clothing/suit/fluff/vetcoat/navy
icon_state = "alchemistcoatnavy"
item_state = "alchemistcoatnavy"
/// PanzerSkull: GRN-DER
/obj/item/clothing/accessory/medal/fluff/panzermedal
@@ -1643,7 +1605,6 @@
desc = "A medal from the bygone Asteroid Wars. Its Ruby shines with a strange intensity."
icon = 'icons/obj/custom_items.dmi'
icon_state = "panzermedal"
item_state = "panzermedal"
item_color = "panzermedal"
/// Sagrotter: Xann Zxiax
@@ -1652,7 +1613,6 @@
desc = "Green Garnet on fancy blue cord, when you look at the Garnet, you feel strangely appeased."
icon = 'icons/obj/custom_items.dmi'
icon_state = "Xann_necklace"
item_state = "Xann_necklace"
item_color = "Xann_necklace"
/// Rb303: Isthel Eisenwald
@@ -1661,7 +1621,6 @@
desc = "An old, striped purple scarf. It appears to be hand-knitted and has the name 'Isthel' written on it in bad handwriting."
icon = 'icons/obj/custom_items.dmi'
icon_state = "rbscarf"
item_state = "rbscarf"
item_color = "rbscarf"
/// Pineapple Salad: Dan Jello
@@ -1677,19 +1636,15 @@
desc = "It's pretty lightweight for a dufflebag, but it only seems to have as much space as an ordinary backpack."
icon = 'icons/obj/custom_items.dmi'
icon_state = "danpack"
item_state = "danpack"
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
/// FullOfSkittles: Kiachi
/obj/item/clothing/under/fluff/kiaoutfit
name = "Suspicious Outfit"
desc = "A very expensive top with intricate details tailored to fit a vox and paired with a glittery blue skirt, probably illegal."
icon = 'icons/obj/custom_items.dmi'
icon_state = "kiaoutfit"
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
icon_state = "kiaoutfit"
item_state = "kiaoutfit"
item_color = "kiaoutfit"
displays_id = FALSE
species_restricted = list("Vox")
@@ -1699,10 +1654,9 @@
name = "Suspicious Witch Hat"
desc = "A black witch hat with a blue sash decorated with tiny glimmering stars and a gold squid-like medallion, probably possessed."
icon = 'icons/obj/custom_items.dmi'
icon_state = "kiahat"
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
icon_state = "kiahat"
item_state = "kiahat"
item_color = "kiahat"
/// FullOfSkittles: Kiachi
@@ -1710,13 +1664,13 @@
name = "Suspicious Mask"
desc = "A sleek mask that blends in with the owner's existing quills using strange technology. It might even be magic..."
icon = 'icons/obj/custom_items.dmi'
icon_state = "kiamask"
inhand_icon_state = null
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/mask.dmi')
icon_state = "kiamask"
item_state = "kiamask"
item_color = "kiamask"
species_restricted = list("Vox")
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/mask.dmi')
/obj/item/clothing/gloves/ring/fluff
name = "fluff ring"
@@ -1741,11 +1695,10 @@
/obj/item/clothing/under/fluff/kikeridress
name = "Kikeri's Dress"
desc = "A simple black dress with a white undercoat, tied with a blue ribbon."
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
icon = 'icons/obj/custom_items.dmi'
icon_state = "kikeridress"
item_state = "kikeridress"
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
item_color = "kikeridress"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
species_restricted = list("Vox")
@@ -1755,26 +1708,26 @@
name = "Kikeri's Mask"
desc = "A light grey mask with masquerade-esque blue details."
icon = 'icons/obj/custom_items.dmi'
icon_state = "kikerimask"
inhand_icon_state = null
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/mask.dmi')
icon_state = "kikerimask"
item_state = "kikerimask"
item_color = "kikerimask"
species_restricted = list("Vox")
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/mask.dmi')
/// Asmerath: Yahiya
/obj/item/clothing/mask/gas/fluff/yahiyamask
name = "Yahiya's Mask"
desc = "A dark brown and silver mask resembling that of an eagle. There is a fiery red gem embedded into the forehead."
icon = 'icons/obj/custom_items.dmi'
icon_state = "yahiyamask"
inhand_icon_state = null
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/mask.dmi')
icon_state = "yahiyamask"
item_state = "yahiyamask"
item_color = "yahiyamask"
species_restricted = list("Vox")
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/mask.dmi')
/obj/item/id_decal/aa07
name = "lifetime ID card decal"
@@ -1786,14 +1739,12 @@
name = "rebel outfit"
desc = "Made in Seattle, 2216."
icon_state = "colin_earle"
item_state = "colin_earle"
item_color = "colin_earle"
// Paratoberfest/contributor rewards
/obj/item/clothing/accessory/pin/reward // Default pin, DO NOT USE - Use the subtypes below
icon = 'icons/obj/custom_items.dmi'
icon_state = "pin_coding"
item_state = "pin_coding"
item_color = "pin_coding"
/obj/item/clothing/accessory/pin/reward/coding
@@ -1804,14 +1755,12 @@
name = "Mapping Contribution Pin"
desc = "A commemorative pin to reward contributions of mapping."
icon_state = "pin_mapping"
item_state = "pin_mapping"
item_color = "pin_mapping"
/obj/item/clothing/accessory/pin/reward/spriting
name = "Spriting Contribution Pin"
desc = "A commemorative pin to reward contributions of spriting."
icon_state = "pin_spriting"
item_state = "pin_spriting"
item_color = "pin_spriting"
#undef USED_MOD_HELM