diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 5307a4cceb9..0b9970c63f7 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -2418,7 +2418,7 @@ /obj/structure/window/spawner/north, /obj/item/paper{ default_raw_text = "A crude mapping of the station layout based on leaked internal documents and orbital snapshots taken during construction. I'm not sure how up-to-date this is anymore.."; - icon = 'icons/obj/weapons/items_and_weapons.dmi'; + icon = 'icons/obj/objects.dmi'; icon_state = "blueprints"; inhand_icon_state = "blueprints"; name = "station layout" diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index 5175b260232..5f65cc236d7 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -114,14 +114,6 @@ #define COLOR_LIGHT_BROWN "#996666" #define COLOR_BROWNER_BROWN "#663300" -//Color defines used by the soapstone (based on readability against grey tiles) -#define COLOR_SOAPSTONE_PLASTIC "#a19d94" -#define COLOR_SOAPSTONE_IRON "#b2b2b2" -#define COLOR_SOAPSTONE_BRONZE "#FE8001" -#define COLOR_SOAPSTONE_SILVER "#FFFFFF" -#define COLOR_SOAPSTONE_GOLD "#FFD900" -#define COLOR_SOAPSTONE_DIAMOND "#00ffee" - #define COLOR_GREEN_GRAY "#99BB76" #define COLOR_RED_GRAY "#B4696A" #define COLOR_PALE_BLUE_GRAY "#98C5DF" diff --git a/code/datums/components/twohanded.dm b/code/datums/components/twohanded.dm index aa82d8e3544..a0c491a27a5 100644 --- a/code/datums/components/twohanded.dm +++ b/code/datums/components/twohanded.dm @@ -345,6 +345,7 @@ */ /obj/item/offhand name = "offhand" + icon = 'icons/obj/weapons/hand.dmi' icon_state = "offhand" w_class = WEIGHT_CLASS_HUGE item_flags = ABSTRACT diff --git a/code/datums/elements/ridable.dm b/code/datums/elements/ridable.dm index 2ddf3e9ed0f..15b81e73f24 100644 --- a/code/datums/elements/ridable.dm +++ b/code/datums/elements/ridable.dm @@ -163,7 +163,7 @@ /obj/item/riding_offhand name = "offhand" - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/hand.dmi' icon_state = "offhand" w_class = WEIGHT_CLASS_HUGE item_flags = ABSTRACT | DROPDEL | NOBLUDGEON diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index 2fe831f600a..b941dab8dea 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -177,7 +177,7 @@ throw_speed = 2 attack_verb_continuous = list("smashes", "slams", "whacks", "thwacks") attack_verb_simple = list("smash", "slam", "whack", "thwack") - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/staff.dmi' icon_state = "bostaff0" base_icon_state = "bostaff" lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' diff --git a/code/datums/mutations/tongue_spike.dm b/code/datums/mutations/tongue_spike.dm index d0d8fca4c5f..fd561fdfc34 100644 --- a/code/datums/mutations/tongue_spike.dm +++ b/code/datums/mutations/tongue_spike.dm @@ -43,6 +43,7 @@ /obj/item/hardened_spike name = "biomass spike" desc = "Hardened biomass, shaped into a spike. Very pointy!" + icon = 'icons/obj/weapons/thrown.dmi' icon_state = "tonguespike" force = 2 throwforce = 15 //15 + 2 (WEIGHT_CLASS_SMALL) * 4 (EMBEDDED_IMPACT_PAIN_MULTIPLIER) = i didnt do the math diff --git a/code/datums/mutations/touch.dm b/code/datums/mutations/touch.dm index 0964492d1ca..1f1cefe1cbe 100644 --- a/code/datums/mutations/touch.dm +++ b/code/datums/mutations/touch.dm @@ -82,5 +82,6 @@ /obj/item/melee/touch_attack/shock name = "\improper shock touch" desc = "This is kind of like when you rub your feet on a shag rug so you can zap your friends, only a lot less safe." + icon = 'icons/obj/weapons/hand.dmi' icon_state = "zapper" inhand_icon_state = "zapper" diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index f79584e0144..20b3aef11ac 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -3,7 +3,7 @@ desc = "Better stay away from that thing." density = FALSE anchored = TRUE - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/grenade.dmi' icon_state = "uglymine" base_icon_state = "uglymine" /// We manually check to see if we've been triggered in case multiple atoms cross us in the time between the mine being triggered and it actually deleting, to avoid a race condition with multiple detonations diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index b703c836833..ee123290d2f 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -3,7 +3,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e /// Anything you can pick up and hold. /obj/item name = "item" - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/objects.dmi' blocks_emissive = EMISSIVE_BLOCK_GENERIC pass_flags_self = PASSITEM diff --git a/code/game/objects/items/binoculars.dm b/code/game/objects/items/binoculars.dm index f089508fe8e..15c78ba2960 100644 --- a/code/game/objects/items/binoculars.dm +++ b/code/game/objects/items/binoculars.dm @@ -2,6 +2,7 @@ name = "binoculars" desc = "Used for long-distance surveillance." inhand_icon_state = "binoculars" + icon = 'icons/obj/device.dmi' icon_state = "binoculars" worn_icon_state = "binoculars" lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 28009da0198..b62b84e1d81 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -1,6 +1,6 @@ /obj/item/areaeditor name = "area modification item" - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/objects.dmi' icon_state = "blueprints" inhand_icon_state = "blueprints" attack_verb_continuous = list("attacks", "baps", "hits") @@ -43,7 +43,7 @@ /obj/item/areaeditor/blueprints name = "station blueprints" desc = "Blueprints of the station. There is a \"Classified\" stamp and several coffee stains on it." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/objects.dmi' icon_state = "blueprints" fluffnotice = "Property of Nanotrasen. For heads of staff only. Store in high-secure storage." resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF @@ -206,7 +206,7 @@ /obj/item/areaeditor/blueprints/cyborg name = "station schematics" desc = "A digital copy of the station blueprints stored in your memory." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/objects.dmi' icon_state = "blueprints" fluffnotice = "Intellectual Property of Nanotrasen. For use in engineering cyborgs only. Wipe from memory upon departure from the station." diff --git a/code/game/objects/items/chainsaw.dm b/code/game/objects/items/chainsaw.dm index e94657c3457..00d532189ab 100644 --- a/code/game/objects/items/chainsaw.dm +++ b/code/game/objects/items/chainsaw.dm @@ -3,6 +3,7 @@ /obj/item/chainsaw name = "chainsaw" desc = "A versatile power tool. Useful for limbing trees and delimbing humans." + icon = 'icons/obj/weapons/chainsaw.dmi' icon_state = "chainsaw_off" lefthand_file = 'icons/mob/inhands/weapons/chainsaw_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi' diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm index 99733d170f5..0a3605053f4 100644 --- a/code/game/objects/items/clown_items.dm +++ b/code/game/objects/items/clown_items.dm @@ -14,7 +14,7 @@ name = "soap" desc = "A cheap bar of soap. Doesn't smell." gender = PLURAL - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/watercloset.dmi' icon_state = "soap" inhand_icon_state = "soap" worn_icon_state = "soap" @@ -160,7 +160,7 @@ /obj/item/bikehorn name = "bike horn" desc = "A horn off of a bicycle. Rumour has it that they're made from recycled clowns." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/horn.dmi' icon_state = "bike_horn" inhand_icon_state = "bike_horn" worn_icon_state = "horn" diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm index 37f8c4288b9..b2ccded220b 100644 --- a/code/game/objects/items/cosmetics.dm +++ b/code/game/objects/items/cosmetics.dm @@ -2,7 +2,7 @@ gender = PLURAL name = "red lipstick" desc = "A generic brand of lipstick." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/cosmetic.dmi' icon_state = "lipstick" inhand_icon_state = "lipstick" w_class = WEIGHT_CLASS_TINY @@ -26,7 +26,6 @@ inhand_icon_state = "lipstick[open ? "open" : null]" return ..() - /obj/item/lipstick/update_overlays() . = ..() if(!open) @@ -35,7 +34,6 @@ colored_overlay.color = colour . += colored_overlay - /obj/item/lipstick/purple name = "purple lipstick" colour = "purple" @@ -44,7 +42,7 @@ //It's still called Jade, but theres no HTML color for jade, so we use lime. name = "jade lipstick" colour = "lime" - + /obj/item/lipstick/blue name = "blue lipstick" colour = "blue" @@ -135,7 +133,7 @@ /obj/item/razor name = "electric razor" desc = "The latest and greatest power razor born from the science of shaving." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/cosmetic.dmi' icon_state = "razor" inhand_icon_state = "razor" flags_1 = CONDUCT_1 @@ -156,7 +154,6 @@ H.update_body_parts() playsound(loc, 'sound/items/welder2.ogg', 20, TRUE) - /obj/item/razor/attack(mob/M, mob/living/user) if(ishuman(M)) var/mob/living/carbon/human/H = M diff --git a/code/game/objects/items/courtroom.dm b/code/game/objects/items/courtroom.dm index cc4585b57a0..8baba284314 100644 --- a/code/game/objects/items/courtroom.dm +++ b/code/game/objects/items/courtroom.dm @@ -5,7 +5,7 @@ /obj/item/gavelhammer name = "gavel hammer" desc = "Order, order! No bombs in my courthouse." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/hammer.dmi' icon_state = "gavelhammer" force = 5 throwforce = 6 @@ -26,7 +26,7 @@ /obj/item/gavelblock name = "gavel block" desc = "Smack it with a gavel hammer when the assistants get rowdy." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/hammer.dmi' icon_state = "gavelblock" force = 2 throwforce = 2 diff --git a/code/game/objects/items/crab17.dm b/code/game/objects/items/crab17.dm index 1ae547196ab..234265e18aa 100644 --- a/code/game/objects/items/crab17.dm +++ b/code/game/objects/items/crab17.dm @@ -1,7 +1,7 @@ /obj/item/suspiciousphone name = "suspicious phone" desc = "This device raises pink levels to unknown highs." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/device_syndie.dmi' icon_state = "suspiciousphone" w_class = WEIGHT_CLASS_SMALL attack_verb_continuous = list("dumps") diff --git a/code/game/objects/items/door_seal.dm b/code/game/objects/items/door_seal.dm index 408a0e0c1b6..3c5f091965f 100644 --- a/code/game/objects/items/door_seal.dm +++ b/code/game/objects/items/door_seal.dm @@ -1,7 +1,7 @@ /obj/item/door_seal name = "pneumatic airlock seal" desc = "A brace used to seal and reinforce an airlock. Useful for making areas inaccessible to those without opposable thumbs." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/airlock_machines.dmi' icon_state = "pneumatic_seal" inhand_icon_state = "pneumatic_seal" lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index b66aa57244a..acffe969677 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -1,7 +1,7 @@ /obj/item/extinguisher name = "fire extinguisher" desc = "A traditional red fire extinguisher." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/extinguisher.dmi' icon_state = "fire_extinguisher0" worn_icon_state = "fire_extinguisher" inhand_icon_state = "fire_extinguisher" diff --git a/code/game/objects/items/hand_items.dm b/code/game/objects/items/hand_items.dm index a0eb14deca3..50d1eff39c9 100644 --- a/code/game/objects/items/hand_items.dm +++ b/code/game/objects/items/hand_items.dm @@ -1,5 +1,7 @@ /// For all of the items that are really just the user's hand used in different ways, mostly (all, really) from emotes /obj/item/hand_item + icon = 'icons/obj/weapons/hand.dmi' + icon_state = "latexballon" force = 0 throwforce = 0 item_flags = DROPDEL | ABSTRACT | HAND_ITEM @@ -111,7 +113,6 @@ /obj/item/hand_item/noogie name = "noogie" desc = "Get someone in an aggressive grab then use this on them to ruin their day." - icon_state = "latexballon" inhand_icon_state = "nothing" /obj/item/hand_item/noogie/attack(mob/living/carbon/target, mob/living/carbon/human/user) @@ -204,7 +205,6 @@ /obj/item/hand_item/slapper name = "slapper" desc = "This is how real men fight." - icon_state = "latexballon" inhand_icon_state = "nothing" attack_verb_continuous = list("slaps") attack_verb_simple = list("slap") @@ -329,10 +329,8 @@ /obj/item/hand_item/hand name = "hand" desc = "Sometimes, you just want to act gentlemanly." - icon_state = "latexballon" inhand_icon_state = "nothing" - /obj/item/hand_item/hand/pre_attack(mob/living/carbon/help_target, mob/living/carbon/helper, params) if(!loc.Adjacent(help_target) || !istype(helper) || !istype(help_target)) return ..() @@ -431,7 +429,6 @@ /obj/item/hand_item/stealer name = "steal" desc = "Your filthy little fingers are ready to commit crimes." - icon_state = "latexballon" inhand_icon_state = "nothing" attack_verb_continuous = list("steals") attack_verb_simple = list("steal") diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index a80ef7ec3a1..2e2542679b3 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -3,6 +3,7 @@ /obj/item/nullrod name = "null rod" desc = "A rod of pure obsidian; its very presence disrupts and dampens 'magical forces'. That's what the guidebook says, anyway." + icon = 'icons/obj/weapons/staff.dmi' icon_state = "nullrod" inhand_icon_state = "nullrod" lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' @@ -61,6 +62,7 @@ /obj/item/nullrod/godhand name = "god hand" desc = "This hand of yours glows with an awesome power!" + icon = 'icons/obj/weapons/hand.dmi' icon_state = "disintegrate" inhand_icon_state = "disintegrate" lefthand_file = 'icons/mob/inhands/items/touchspell_lefthand.dmi' @@ -81,6 +83,7 @@ /obj/item/nullrod/staff name = "red holy staff" desc = "It has a mysterious, protective aura." + icon = 'icons/obj/weapons/staff.dmi' icon_state = "godstaff-red" inhand_icon_state = "godstaff-red" lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' @@ -108,6 +111,7 @@ /obj/item/nullrod/claymore name = "holy claymore" desc = "A weapon fit for a crusade!" + icon = 'icons/obj/weapons/sword.dmi' icon_state = "claymore_gold" inhand_icon_state = "claymore_gold" worn_icon_state = "claymore_gold" @@ -215,6 +219,7 @@ /obj/item/nullrod/sord name = "\improper UNREAL SORD" desc = "This thing is so unspeakably HOLY you are having a hard time even holding it." + icon = 'icons/obj/weapons/sword.dmi' icon_state = "sord" inhand_icon_state = "sord" worn_icon_state = "sord" @@ -236,6 +241,7 @@ /obj/item/nullrod/scythe name = "reaper scythe" desc = "Ask not for whom the bell tolls..." + icon = 'icons/obj/hydroponics/equipment.dmi' icon_state = "scythe1" inhand_icon_state = "scythe1" lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi' @@ -259,6 +265,7 @@ /obj/item/nullrod/scythe/vibro name = "high frequency blade" desc = "Bad references are the DNA of the soul." + icon = 'icons/obj/weapons/sword.dmi' icon_state = "hfrequency0" inhand_icon_state = "hfrequency1" worn_icon_state = "hfrequency0" @@ -272,18 +279,19 @@ /obj/item/nullrod/scythe/spellblade name = "dormant spellblade" desc = "The blade grants the wielder nearly limitless power...if they can figure out how to turn it on, that is." + icon = 'icons/obj/weapons/guns/magic.dmi' icon_state = "spellblade" inhand_icon_state = "spellblade" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' worn_icon_state = "spellblade" - icon = 'icons/obj/weapons/guns/magic.dmi' hitsound = 'sound/weapons/rapierhit.ogg' menu_description = "A sharp blade which partially penetrates armor. Very effective at butchering bodies. Can be worn on the back." /obj/item/nullrod/scythe/talking name = "possessed blade" desc = "When the station falls into chaos, it's nice to have a friend by your side." + icon = 'icons/obj/weapons/sword.dmi' icon_state = "talking_sword" inhand_icon_state = "talking_sword" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' @@ -316,6 +324,7 @@ /obj/item/nullrod/hammer name = "relic war hammer" desc = "This war hammer cost the chaplain forty thousand space dollars." + icon = 'icons/obj/weapons/hammer.dmi' icon_state = "hammeron" inhand_icon_state = "hammeron" worn_icon_state = "hammeron" @@ -333,6 +342,7 @@ /obj/item/nullrod/chainsaw name = "chainsaw hand" desc = "Good? Bad? You're the guy with the chainsaw hand." + icon = 'icons/obj/weapons/chainsaw.dmi' icon_state = "chainsaw_on" inhand_icon_state = "mounted_chainsaw" lefthand_file = 'icons/mob/inhands/weapons/chainsaw_lefthand.dmi' @@ -378,6 +388,7 @@ /obj/item/nullrod/pride_hammer name = "Pride-struck Hammer" desc = "It resonates an aura of Pride." + icon = 'icons/obj/weapons/hammer.dmi' icon_state = "pride" inhand_icon_state = "pride" worn_icon_state = "pride" @@ -407,6 +418,7 @@ /obj/item/nullrod/whip name = "holy whip" desc = "What a terrible night to be on Space Station 13." + icon = 'icons/obj/weapons/whip.dmi' icon_state = "chain" inhand_icon_state = "chain" worn_icon_state = "whip" @@ -501,7 +513,7 @@ hitsound = SFX_SWING_HIT attack_verb_continuous = list("smashes", "slams", "whacks", "thwacks") attack_verb_simple = list("smash", "slam", "whack", "thwack") - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/staff.dmi' icon_state = "bostaff0" inhand_icon_state = "bostaff0" worn_icon_state = "bostaff0" @@ -510,12 +522,13 @@ menu_description = "A staff which provides a medium-low chance of blocking incoming melee attacks and deals a little less damage due to being made of wood. Can be worn on the back." /obj/item/nullrod/tribal_knife - icon_state = "crysknife" + name = "arrhythmic knife" desc = "They say fear is the true mind killer, but stabbing them in the head works too. Honour compels you to not sheathe it once drawn." + icon = 'icons/obj/weapons/sword.dmi' + icon_state = "crysknife" inhand_icon_state = "crysknife" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' - name = "arrhythmic knife" w_class = WEIGHT_CLASS_HUGE sharpness = SHARP_EDGED slot_flags = null @@ -547,6 +560,7 @@ /obj/item/nullrod/pitchfork name = "unholy pitchfork" desc = "Holding this makes you look absolutely devilish." + icon = 'icons/obj/weapons/spear.dmi' icon_state = "pitchfork0" inhand_icon_state = "pitchfork0" lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi' @@ -595,7 +609,7 @@ /obj/item/nullrod/spear name = "ancient spear" desc = "An ancient spear made of brass, I mean gold, I mean bronze. It looks highly mechanical." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/spear.dmi' icon_state = "ratvarian_spear" inhand_icon_state = "ratvarian_spear" lefthand_file = 'icons/mob/inhands/antag/clockwork_lefthand.dmi' diff --git a/code/game/objects/items/implants/implantpad.dm b/code/game/objects/items/implants/implantpad.dm index 32545e92a88..03af306b27a 100644 --- a/code/game/objects/items/implants/implantpad.dm +++ b/code/game/objects/items/implants/implantpad.dm @@ -1,7 +1,7 @@ /obj/item/implantpad name = "implant pad" desc = "Used to modify implants." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/device.dmi' icon_state = "implantpad-0" inhand_icon_state = "electronic" lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm index 7dea0f7c1cd..5285b477fe7 100644 --- a/code/game/objects/items/latexballoon.dm +++ b/code/game/objects/items/latexballoon.dm @@ -1,6 +1,7 @@ /obj/item/latexballon name = "latex glove" desc = "Sterile and airtight." + icon = 'icons/obj/weapons/hand.dmi' icon_state = "latexballon" inhand_icon_state = "greyscale_gloves" lefthand_file = 'icons/mob/inhands/clothing/gloves_righthand.dmi' diff --git a/code/game/objects/items/melee/baton.dm b/code/game/objects/items/melee/baton.dm index 74b8c17dc0e..d333daa0ab1 100644 --- a/code/game/objects/items/melee/baton.dm +++ b/code/game/objects/items/melee/baton.dm @@ -2,7 +2,7 @@ name = "police baton" desc = "A wooden truncheon for beating criminal scum." desc_controls = "Left click to stun, right click to harm." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/baton.dmi' icon_state = "classic_baton" inhand_icon_state = "classic_baton" worn_icon_state = "classic_baton" @@ -287,6 +287,7 @@ /obj/item/melee/baton/telescopic name = "telescopic baton" desc = "A compact yet robust personal defense weapon. Can be concealed when folded." + icon = 'icons/obj/weapons/baton.dmi' icon_state = "telebaton" lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' @@ -357,7 +358,7 @@ /obj/item/melee/baton/telescopic/contractor_baton name = "contractor baton" desc = "A compact, specialised baton assigned to Syndicate contractors. Applies light electrical shocks to targets." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/baton.dmi' icon_state = "contractor_baton" worn_icon_state = "contractor_baton" lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' @@ -387,17 +388,15 @@ name = "stun baton" desc = "A stun baton for incapacitating people with." desc_controls = "Left click to stun, right click to harm." + icon = 'icons/obj/weapons/baton.dmi' icon_state = "stunbaton" inhand_icon_state = "baton" worn_icon_state = "baton" - force = 10 wound_bonus = 0 attack_verb_continuous = list("beats") attack_verb_simple = list("beat") - armor_type = /datum/armor/baton_security - throwforce = 7 stamina_damage = 60 knockdown_time = 5 SECONDS @@ -406,7 +405,6 @@ on_stun_sound = 'sound/weapons/egloves.ogg' on_stun_volume = 50 active = FALSE - context_living_rmb_active = "Harmful Stun" var/throw_stun_chance = 35 @@ -641,6 +639,7 @@ name = "stunprod" desc = "An improvised stun baton." desc_controls = "Left click to stun, right click to harm." + icon = 'icons/obj/weapons/spear.dmi' icon_state = "stunprod" inhand_icon_state = "prod" worn_icon_state = null @@ -707,6 +706,7 @@ name = "\improper OZtek Boomerang" desc = "A device invented in 2486 for the great Space Emu War by the confederacy of Australicus, these high-tech boomerangs also work exceptionally well at stunning crewmembers. Just be careful to catch it when thrown!" throw_speed = 1 + icon = 'icons/obj/weapons/thrown.dmi' icon_state = "boomerang" inhand_icon_state = "boomerang" force = 5 diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 09402d166d5..aacb12fdedd 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -12,6 +12,7 @@ /obj/item/melee/chainofcommand name = "chain of command" desc = "A tool used by great men to placate the frothing masses." + icon = 'icons/obj/weapons/whip.dmi' icon_state = "chain" inhand_icon_state = "chain" worn_icon_state = "whip" @@ -61,6 +62,7 @@ /obj/item/melee/sabre name = "officer's sabre" desc = "An elegant weapon, its monomolecular edge is capable of cutting through flesh and bone with ease." + icon = 'icons/obj/weapons/sword.dmi' icon_state = "sabre" inhand_icon_state = "sabre" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' @@ -151,7 +153,7 @@ /obj/item/melee/beesword name = "The Stinger" desc = "Taken from a giant bee and folded over one thousand times in pure honey. Can sting through anything." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/sword.dmi' icon_state = "beesword" inhand_icon_state = "stinger" worn_icon_state = "stinger" @@ -185,7 +187,7 @@ /obj/item/melee/supermatter_sword name = "supermatter sword" desc = "In a station full of bad ideas, this might just be the worst." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/sword.dmi' icon_state = "supermatter_sword" inhand_icon_state = "supermatter_sword" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' @@ -286,6 +288,7 @@ /obj/item/melee/curator_whip name = "curator's whip" desc = "Somewhat eccentric and outdated, it still stings like hell to be hit by." + icon = 'icons/obj/weapons/whip.dmi' icon_state = "whip" inhand_icon_state = "chain" lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' @@ -309,6 +312,7 @@ /obj/item/melee/roastingstick name = "advanced roasting stick" desc = "A telescopic roasting stick with a miniature shield generator designed to ensure entry into various high-tech shielded cooking ovens and firepits." + icon = 'icons/obj/kitchen.dmi' icon_state = "roastingstick" inhand_icon_state = null worn_icon_state = "tele_baton" diff --git a/code/game/objects/items/paint.dm b/code/game/objects/items/paint.dm index 5675bbd3a03..dc347e88bba 100644 --- a/code/game/objects/items/paint.dm +++ b/code/game/objects/items/paint.dm @@ -5,7 +5,7 @@ gender= PLURAL name = "paint" desc = "Used to recolor floors and walls. Can be removed by the janitor." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/art/paint.dmi' icon_state = "paint_neutral" inhand_icon_state = "paintcan" w_class = WEIGHT_CLASS_NORMAL diff --git a/code/game/objects/items/pitchfork.dm b/code/game/objects/items/pitchfork.dm index 35be37d91a2..7538c1123bd 100644 --- a/code/game/objects/items/pitchfork.dm +++ b/code/game/objects/items/pitchfork.dm @@ -5,6 +5,7 @@ * Also fireproof for some reason. */ /obj/item/pitchfork + icon = 'icons/obj/weapons/spear.dmi' icon_state = "pitchfork0" base_icon_state = "pitchfork" lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi' diff --git a/code/game/objects/items/powerfist.dm b/code/game/objects/items/powerfist.dm index d4d0886a81e..4314db829fd 100644 --- a/code/game/objects/items/powerfist.dm +++ b/code/game/objects/items/powerfist.dm @@ -9,6 +9,7 @@ /obj/item/melee/powerfist name = "power-fist" desc = "A metal gauntlet with a piston-powered ram ontop for that extra 'ompfh' in your punch." + icon = 'icons/obj/device_syndie.dmi' icon_state = "powerfist" inhand_icon_state = "powerfist" lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm index 49fc381b4ad..beda3ca18a3 100644 --- a/code/game/objects/items/religion.dm +++ b/code/game/objects/items/religion.dm @@ -329,6 +329,7 @@ /obj/item/godstaff name = "godstaff" desc = "It's a stick..?" + icon = 'icons/obj/weapons/staff.dmi' icon_state = "godstaff-red" lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi' @@ -336,7 +337,6 @@ var/staffcooldown = 0 var/staffwait = 30 - /obj/item/godstaff/afterattack(atom/target, mob/user, proximity_flag, click_parameters) . = ..() if(staffcooldown + staffwait > world.time) diff --git a/code/game/objects/items/signs.dm b/code/game/objects/items/signs.dm index 38a646d6387..bc5652914ad 100644 --- a/code/game/objects/items/signs.dm +++ b/code/game/objects/items/signs.dm @@ -1,4 +1,5 @@ /obj/item/picket_sign + icon = 'icons/obj/objects.dmi' icon_state = "picket" inhand_icon_state = "picket" name = "blank picket sign" diff --git a/code/game/objects/items/singularityhammer.dm b/code/game/objects/items/singularityhammer.dm index 6d03ad595d6..50a97c215d8 100644 --- a/code/game/objects/items/singularityhammer.dm +++ b/code/game/objects/items/singularityhammer.dm @@ -1,6 +1,7 @@ /obj/item/singularityhammer name = "singularity hammer" desc = "The pinnacle of close combat technology, the hammer harnesses the power of a miniaturized singularity to deal crushing blows." + icon = 'icons/obj/weapons/hammer.dmi' icon_state = "singularity_hammer0" base_icon_state = "singularity_hammer" lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi' @@ -78,6 +79,7 @@ /obj/item/mjollnir name = "Mjolnir" desc = "A weapon worthy of a god, able to strike with the force of a lightning bolt. It crackles with barely contained energy." + icon = 'icons/obj/weapons/hammer.dmi' icon_state = "mjollnir0" base_icon_state = "mjollnir" worn_icon_state = "mjolnir" diff --git a/code/game/objects/items/skub.dm b/code/game/objects/items/skub.dm index 506bf4c91b9..0c70909786a 100644 --- a/code/game/objects/items/skub.dm +++ b/code/game/objects/items/skub.dm @@ -1,7 +1,7 @@ /obj/item/skub desc = "It's skub." name = "skub" - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/objects.dmi' icon_state = "skub" w_class = WEIGHT_CLASS_BULKY attack_verb_continuous = list("skubs") diff --git a/code/game/objects/items/spear.dm b/code/game/objects/items/spear.dm index 15640cd3691..a7c7564537f 100644 --- a/code/game/objects/items/spear.dm +++ b/code/game/objects/items/spear.dm @@ -1,5 +1,6 @@ //spears /obj/item/spear + icon = 'icons/obj/weapons/spear.dmi' icon_state = "spearglass0" lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi' diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index a903ae2bb08..11c8d38f543 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -73,7 +73,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \ /obj/item/emptysandbag name = "empty sandbag" desc = "A bag to be filled with sand." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/stack_objects.dmi' icon_state = "sandbag" w_class = WEIGHT_CLASS_TINY diff --git a/code/game/objects/items/tail_pin.dm b/code/game/objects/items/tail_pin.dm index 18d7d8da16f..9795bc85551 100644 --- a/code/game/objects/items/tail_pin.dm +++ b/code/game/objects/items/tail_pin.dm @@ -1,4 +1,5 @@ /obj/item/tail_pin + icon = 'icons/obj/poster.dmi' icon_state = "tailpin" name = "tail pin" desc = "Offically branded 'pin the tail on the corgi' style party implement. Not intended to be used on people." diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index b0bfe63e7e5..8324374dc14 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -606,7 +606,7 @@ /obj/item/toy/katana name = "replica katana" desc = "Woefully underpowered in D20." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/sword.dmi' icon_state = "katana" inhand_icon_state = "katana" worn_icon_state = "katana" diff --git a/code/game/objects/items/v8_engine.dm b/code/game/objects/items/v8_engine.dm index e143aed2401..c3e5f311461 100644 --- a/code/game/objects/items/v8_engine.dm +++ b/code/game/objects/items/v8_engine.dm @@ -6,7 +6,7 @@ /obj/item/v8_engine name = "ancient engine" desc = "An extremely well perserved, massive V8 engine from the early 2000s. It seems to be missing the rest of the vehicle. There's a tiny label on the side." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/sword.dmi' icon_state = "v8_engine" w_class = WEIGHT_CLASS_HUGE force = 5 @@ -42,11 +42,10 @@ user.mind.teach_crafting_recipe(/datum/crafting_recipe/house_edge) to_chat(user, span_notice("You learned how to make the House Edge.")) - /obj/item/house_edge name = "House Edge" desc = "Dangerous. Loud. Sleek. It has a built in roulette wheel. This thing could easily rip your arm off if you're not careful." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/sword.dmi' icon_state = "house_edge0" inhand_icon_state = "house_edge0" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 6140be05a0e..f22a63b30ae 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -1,7 +1,7 @@ /obj/item/banhammer desc = "A banhammer." name = "banhammer" - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/hammer.dmi' icon_state = "toyhammer" slot_flags = ITEM_SLOT_BELT throwforce = 0 @@ -43,6 +43,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/sord name = "\improper SORD" desc = "This thing is so unspeakably shitty you are having a hard time even holding it." + icon = 'icons/obj/weapons/sword.dmi' icon_state = "sord" inhand_icon_state = "sord" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' @@ -63,6 +64,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/claymore name = "claymore" desc = "What are you standing around staring at this for? Get to killing!" + icon = 'icons/obj/weapons/sword.dmi' icon_state = "claymore" inhand_icon_state = "claymore" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' @@ -261,6 +263,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/katana name = "katana" desc = "Woefully underpowered in D20." + icon = 'icons/obj/weapons/sword.dmi' icon_state = "katana" inhand_icon_state = "katana" worn_icon_state = "katana" @@ -294,6 +297,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/wirerod name = "wired rod" desc = "A rod with some wire wrapped around the top. It'd be easy to attach something to the top bit." + icon = 'icons/obj/weapons/spear.dmi' icon_state = "wiredrod" inhand_icon_state = "rods" flags_1 = CONDUCT_1 @@ -356,6 +360,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/throwing_star name = "throwing star" desc = "An ancient weapon still used to this day, due to its ease of lodging itself into its victim's body parts." + icon = 'icons/obj/weapons/thrown.dmi' icon_state = "throwingstar" inhand_icon_state = "eshield" lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' @@ -387,6 +392,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/switchblade name = "switchblade" + icon = 'icons/obj/weapons/sword.dmi' icon_state = "switchblade" base_icon_state = "switchblade" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' @@ -443,7 +449,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/phone name = "red phone" desc = "Should anything ever go wrong..." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/device.dmi' icon_state = "red_phone" force = 3 throwforce = 2 @@ -464,7 +470,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/cane name = "cane" desc = "A cane used by a true gentleman. Or a clown." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/staff.dmi' icon_state = "cane" inhand_icon_state = "stick" lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' @@ -546,7 +552,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/staff/stick name = "stick" desc = "A great tool to drag someone else's drinks across the bar." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/staff.dmi' icon_state = "cane" inhand_icon_state = "stick" lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' @@ -602,6 +608,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/tailclub name = "tail club" desc = "For the beating to death of lizards with their own tails." + icon = 'icons/obj/weapons/club.dmi' icon_state = "tailclub" force = 14 throwforce = 1 // why are you throwing a club do you even weapon @@ -626,7 +633,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/melee/skateboard name = "skateboard" desc = "A skateboard. It can be placed on its wheels and ridden, or used as a radical weapon." - icon_state = "skateboard" + icon = 'icons/obj/vehicles.dmi' + icon_state = "skateboard_held" inhand_icon_state = "skateboard" force = 12 throwforce = 4 @@ -649,7 +657,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/melee/skateboard/pro name = "skateboard" desc = "An EightO brand professional skateboard. It looks sturdy and well made." - icon_state = "skateboard2" + icon_state = "skateboard2_held" inhand_icon_state = "skateboard2" board_item_type = /obj/vehicle/ridden/scooter/skateboard/pro custom_premium_price = PAYCHECK_COMMAND * 5 @@ -657,7 +665,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/melee/skateboard/hoverboard name = "hoverboard" desc = "A blast from the past, so retro!" - icon_state = "hoverboard_red" + icon_state = "hoverboard_red_held" inhand_icon_state = "hoverboard_red" board_item_type = /obj/vehicle/ridden/scooter/skateboard/hoverboard custom_premium_price = PAYCHECK_COMMAND * 5.4 //If I can't make it a meme I'll make it RAD @@ -665,14 +673,14 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/melee/skateboard/hoverboard/admin name = "Board Of Directors" desc = "The engineering complexity of a spaceship concentrated inside of a board. Just as expensive, too." - icon_state = "hoverboard_nt" + icon_state = "hoverboard_nt_held" inhand_icon_state = "hoverboard_nt" board_item_type = /obj/vehicle/ridden/scooter/skateboard/hoverboard/admin /obj/item/melee/baseball_bat name = "baseball bat" desc = "There ain't a skull in the league that can withstand a swatter." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/bat.dmi' icon_state = "baseball_bat" inhand_icon_state = "baseball_bat" lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' @@ -819,7 +827,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/melee/flyswatter name = "flyswatter" desc = "Useful for killing pests of all sizes." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/hydroponics/equipment.dmi' icon_state = "flyswatter" inhand_icon_state = "flyswatter" lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' @@ -880,7 +888,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/extendohand name = "extendo-hand" desc = "Futuristic tech has allowed these classic spring-boxing toys to essentially act as a fully functional hand-operated hand prosthetic." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/toys/toy.dmi' icon_state = "extendohand" inhand_icon_state = "extendohand" lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' @@ -910,7 +918,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 hitsound = SFX_SWING_HIT attack_verb_continuous = list("whacks", "thwacks", "wallops", "socks") attack_verb_simple = list("whack", "thwack", "wallop", "sock") - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/club.dmi' icon_state = "gohei" inhand_icon_state = "gohei" lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' @@ -919,6 +927,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/melee/moonlight_greatsword name = "moonlight greatsword" desc = "Don't tell anyone you put any points into dex, though." + icon = 'icons/obj/weapons/sword.dmi' icon_state = "swordon" inhand_icon_state = "swordon" worn_icon_state = "swordon" @@ -940,6 +949,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 name = "high frequency blade" desc = "A sword reinforced by a powerful alternating current and resonating at extremely high vibration frequencies. \ This oscillation weakens the molecular bonds of anything it cuts, thereby increasing its cutting ability." + icon = 'icons/obj/weapons/sword.dmi' icon_state = "hfrequency0" worn_icon_state = "hfrequency0" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' diff --git a/code/game/objects/structures/deployable_turret.dm b/code/game/objects/structures/deployable_turret.dm index 28594582f88..3df0efd1eec 100644 --- a/code/game/objects/structures/deployable_turret.dm +++ b/code/game/objects/structures/deployable_turret.dm @@ -237,7 +237,7 @@ /obj/item/gun_control name = "turret controls" - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/hand.dmi' icon_state = "offhand" w_class = WEIGHT_CLASS_HUGE item_flags = ABSTRACT | NOBLUDGEON | DROPDEL diff --git a/code/game/objects/structures/showcase.dm b/code/game/objects/structures/showcase.dm index f1bd6cd6111..4e8b9d2aa8b 100644 --- a/code/game/objects/structures/showcase.dm +++ b/code/game/objects/structures/showcase.dm @@ -123,7 +123,7 @@ name = "seppuku katana" density = 0 desc = "Welp, only one way to recover your honour." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/sword.dmi' icon_state = "katana" //Deconstructing diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index c48c30bd921..4fe4485a8fa 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -773,7 +773,7 @@ /obj/structure/rack name = "rack" desc = "Different from the Middle Ages version." - icon = 'icons/obj/objects.dmi' + icon = 'icons/obj/structures.dmi' icon_state = "rack" layer = TABLE_LAYER density = TRUE @@ -855,7 +855,7 @@ /obj/item/rack_parts name = "rack parts" desc = "Parts of a rack." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/structures.dmi' icon_state = "rack_parts" inhand_icon_state = "rack_parts" flags_1 = CONDUCT_1 diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index ff70b992e3c..96978464d8f 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -240,7 +240,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/urinal, 32) /obj/item/food/urinalcake name = "urinal cake" desc = "The noble urinal cake, protecting the station's pipes from the station's pee. Do not eat." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/watercloset.dmi' icon_state = "urinalcake" w_class = WEIGHT_CLASS_TINY food_reagents = list( diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index 21647c29e51..7de9b5744a1 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -327,7 +327,7 @@ /obj/item/melee/blood_magic name = "\improper magical aura" desc = "A sinister looking aura that distorts the flow of reality around it." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/hand.dmi' lefthand_file = 'icons/mob/inhands/items/touchspell_lefthand.dmi' righthand_file = 'icons/mob/inhands/items/touchspell_righthand.dmi' icon_state = "disintegrate" @@ -785,7 +785,7 @@ var/static/list/spells = list( "Bloody Halberd (150)" = image(icon = 'icons/obj/cult/items_and_weapons.dmi', icon_state = "occultpoleaxe0"), "Blood Bolt Barrage (300)" = image(icon = 'icons/obj/weapons/guns/ballistic.dmi', icon_state = "arcane_barrage"), - "Blood Beam (500)" = image(icon = 'icons/obj/weapons/items_and_weapons.dmi', icon_state = "disintegrate") + "Blood Beam (500)" = image(icon = 'icons/obj/weapons/hand.dmi', icon_state = "disintegrate") ) var/choice = show_radial_menu(user, src, spells, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE) if(!check_menu(user)) diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index 54dad2158ab..7b1f99fe5b6 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -835,7 +835,7 @@ Striking a noncultist, however, will tear their flesh."} /obj/item/blood_beam name = "\improper magical aura" desc = "Sinister looking aura that distorts the flow of reality around it." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/hand.dmi' lefthand_file = 'icons/mob/inhands/items/touchspell_lefthand.dmi' righthand_file = 'icons/mob/inhands/items/touchspell_righthand.dmi' icon_state = "disintegrate" diff --git a/code/modules/antagonists/heretic/magic/flesh_surgery.dm b/code/modules/antagonists/heretic/magic/flesh_surgery.dm index 0e51c651318..2a216b08969 100644 --- a/code/modules/antagonists/heretic/magic/flesh_surgery.dm +++ b/code/modules/antagonists/heretic/magic/flesh_surgery.dm @@ -229,5 +229,6 @@ /obj/item/melee/touch_attack/flesh_surgery name = "\improper knit flesh" desc = "Let's go practice medicine." + icon = 'icons/obj/weapons/hand.dmi' icon_state = "disintegrate" inhand_icon_state = "disintegrate" diff --git a/code/modules/antagonists/ninja/energy_katana.dm b/code/modules/antagonists/ninja/energy_katana.dm index bb354d15ea4..855bd245eb0 100644 --- a/code/modules/antagonists/ninja/energy_katana.dm +++ b/code/modules/antagonists/ninja/energy_katana.dm @@ -13,6 +13,7 @@ name = "energy katana" desc = "A katana infused with strong energy." desc_controls = "Right-click to dash." + icon = 'icons/obj/weapons/sword.dmi' icon_state = "energy_katana" inhand_icon_state = "energy_katana" worn_icon_state = "energy_katana" diff --git a/code/modules/antagonists/traitor/objectives/sabotage_machinery.dm b/code/modules/antagonists/traitor/objectives/sabotage_machinery.dm index 71f56927dab..b066683741b 100644 --- a/code/modules/antagonists/traitor/objectives/sabotage_machinery.dm +++ b/code/modules/antagonists/traitor/objectives/sabotage_machinery.dm @@ -141,7 +141,7 @@ GLOBAL_DATUM_INIT(objective_machine_handler, /datum/objective_target_machine_han /obj/item/traitor_machine_trapper name = "suspicious device" desc = "It looks dangerous." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/grenade.dmi' icon_state = "boobytrap" /// Light explosion range, to hurt the person using the machine diff --git a/code/modules/antagonists/traitor/objectives/steal.dm b/code/modules/antagonists/traitor/objectives/steal.dm index 9ff7cdc5134..52a00daab10 100644 --- a/code/modules/antagonists/traitor/objectives/steal.dm +++ b/code/modules/antagonists/traitor/objectives/steal.dm @@ -250,7 +250,7 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new()) desc = "It looks dangerous." item_flags = EXAMINE_SKIP - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/device_syndie.dmi' icon_state = "bug" /// The object on which this bug can be planted on. Has to be a type. diff --git a/code/modules/clothing/ears/_ears.dm b/code/modules/clothing/ears/_ears.dm index 285d3e2c157..c4001d23629 100644 --- a/code/modules/clothing/ears/_ears.dm +++ b/code/modules/clothing/ears/_ears.dm @@ -12,6 +12,7 @@ /obj/item/clothing/ears/earmuffs name = "earmuffs" desc = "Protects your hearing from loud noises, and quiet ones as well." + icon = 'icons/obj/clothing/ears.dmi' icon_state = "earmuffs" inhand_icon_state = "earmuffs" clothing_traits = list(TRAIT_DEAF) diff --git a/code/modules/fishing/fish/chasm_detritus.dm b/code/modules/fishing/fish/chasm_detritus.dm index 4b03dbe5704..4960387526b 100644 --- a/code/modules/fishing/fish/chasm_detritus.dm +++ b/code/modules/fishing/fish/chasm_detritus.dm @@ -9,6 +9,7 @@ /obj/item/chasm_detritus name = "chasm detritus" desc = "Abstract concept of an object which once fell into a deep hole." + icon = 'icons/obj/objects.dmi' icon_state = "skub" /// The chance (out of 100) to fish out something from `default_contents` /// even if there's something in GLOB.chasm_storage. diff --git a/code/game/objects/items/bouquets.dm b/code/modules/hydroponics/bouquets.dm similarity index 92% rename from code/game/objects/items/bouquets.dm rename to code/modules/hydroponics/bouquets.dm index 8a01e2a4602..339477a6cf4 100644 --- a/code/game/objects/items/bouquets.dm +++ b/code/modules/hydroponics/bouquets.dm @@ -2,7 +2,7 @@ /obj/item/bouquet name = "mixed bouquet" desc = "A bouquet of sunflowers, lilies, and geraniums. How delightful." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/hydroponics/bouquet.dmi' icon_state = "mixedbouquet" /obj/item/bouquet/sunflower diff --git a/code/modules/hydroponics/grown/weeds/nettle.dm b/code/modules/hydroponics/grown/weeds/nettle.dm index ca1ebb13ea2..316cc7723ac 100644 --- a/code/modules/hydroponics/grown/weeds/nettle.dm +++ b/code/modules/hydroponics/grown/weeds/nettle.dm @@ -36,7 +36,6 @@ seed = /obj/item/seeds/nettle name = "\improper nettle" desc = "It's probably not wise to touch it with bare hands..." - icon = 'icons/obj/weapons/items_and_weapons.dmi' icon_state = "nettle" inhand_icon_state = "nettle" bite_consumption_mod = 2 diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 19ff2227136..048c8afe4ab 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -416,7 +416,7 @@ /obj/item/cultivator name = "cultivator" desc = "It's used for removing weeds or scratching your back." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/hydroponics/equipment.dmi' icon_state = "cultivator" inhand_icon_state = "cultivator" lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi' @@ -467,7 +467,7 @@ /obj/item/hatchet name = "hatchet" desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/hydroponics/equipment.dmi' icon_state = "hatchet" inhand_icon_state = "hatchet" lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi' @@ -504,12 +504,13 @@ flags_1 = NONE /obj/item/scythe + name = "scythe" + desc = "A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow." + icon = 'icons/obj/hydroponics/equipment.dmi' icon_state = "scythe0" inhand_icon_state = "scythe0" lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi' - name = "scythe" - desc = "A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow." force = 13 throwforce = 5 throw_speed = 2 diff --git a/code/modules/mapfluff/ruins/spaceruin_code/derelict_sulaco.dm b/code/modules/mapfluff/ruins/spaceruin_code/derelict_sulaco.dm index 5401433c8a1..026b9b690b8 100644 --- a/code/modules/mapfluff/ruins/spaceruin_code/derelict_sulaco.dm +++ b/code/modules/mapfluff/ruins/spaceruin_code/derelict_sulaco.dm @@ -8,17 +8,17 @@ /obj/item/paper/ruins/derelict_sulaco/birthday name = "to our captain" desc = "Although faint, you can make out the words 'always faithful!' on the back of this photo." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/art/camera.dmi' icon_state = "photo" show_written_words = FALSE - + default_raw_text = "*This looks to be a photo of the captain's birthday, held in a festivized cafeteria. The crew's smiles and laughter beam through discolored film, where one staff officer has his superior enveloped in a warm hug. Everyone looks happy together. A gift is being forced into the captain's hands: some silly, mischievous-looking 'runner' plushie.*" /obj/item/clothing/suit/armor/vest/marine/sulaco name = "damaged tactical armor vest" desc = "An old, roughed up set of the finest mass produced, stamped plasteel armor. This piece of equipment has lost most of its protective qualities to time, yet it is still more than serviceable for giving xenos the middle finger." armor_type = /datum/armor/derelict_marine - + /obj/item/clothing/head/helmet/marine/sulaco name = "damaged tactical combat helmet" desc = "A tactical black helmet, barely sealed from outside hazards with a plate of glass and not much else. Not as protective as it used to be, but it is still completely functional." @@ -30,7 +30,7 @@ bio = 100 fire = 40 acid = 50 - wound = 20 + wound = 20 /obj/machinery/computer/terminal/sulaco tguitheme = "abductor" diff --git a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm index ced693283a6..303aa01d8c4 100644 --- a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm +++ b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm @@ -4,6 +4,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) /obj/item/hilbertshotel name = "Hilbert's Hotel" desc = "A sphere of what appears to be an intricate network of bluespace. Observing it in detail seems to give you a headache as you try to comprehend the infinite amount of infinitesimally distinct points on its surface." + icon = 'icons/obj/objects.dmi' icon_state = "hilbertshotel" w_class = WEIGHT_CLASS_SMALL resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF diff --git a/code/modules/mining/lavaland/megafauna_loot.dm b/code/modules/mining/lavaland/megafauna_loot.dm index 1441eb3aa3b..1ae8955bf7a 100644 --- a/code/modules/mining/lavaland/megafauna_loot.dm +++ b/code/modules/mining/lavaland/megafauna_loot.dm @@ -618,6 +618,7 @@ /obj/item/melee/ghost_sword name = "\improper spectral blade" desc = "A rusted and dulled blade. It doesn't look like it'd do much damage. It glows weakly." + icon = 'icons/obj/weapons/sword.dmi' icon_state = "spectral" inhand_icon_state = "spectral" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index 17c26380214..f9923d1c3a6 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -869,7 +869,7 @@ desc = "It emits a strange aura, as if there was still life within it..." max_integrity = 50 armor_type = /datum/armor/structure_cloth_pile - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/objects.dmi' icon_state = "pile_bandages" resistance_flags = FLAMMABLE diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index 0fb4fb6f93c..6fec562e0e2 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -104,7 +104,7 @@ name = "pile of bear armor" desc = "A scattered pile of various shaped armor pieces fitted for a bear, some duct tape, and a nail filer. Crude instructions \ are written on the back of one of the plates in russian. This seems like an awful idea." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/objects.dmi' icon_state = "bear_armor_upgrade" /obj/item/bear_armor/afterattack(atom/target, mob/user, proximity_flag) diff --git a/code/modules/photography/_pictures.dm b/code/modules/photography/_pictures.dm index a645ab18842..e6df79d0b6c 100644 --- a/code/modules/photography/_pictures.dm +++ b/code/modules/photography/_pictures.dm @@ -53,7 +53,7 @@ if(!picture_image) return var/icon/small_img = icon(picture_image) - var/icon/ic = icon('icons/obj/weapons/items_and_weapons.dmi', iconstate ? iconstate :"photo") + var/icon/ic = icon('icons/obj/art/camera.dmi', iconstate ? iconstate :"photo") small_img.Scale(8, 8) ic.Blend(small_img,ICON_OVERLAY, 13, 13) picture_icon = ic diff --git a/code/modules/photography/camera/camera.dm b/code/modules/photography/camera/camera.dm index ce55fee58c4..0e7fda46e1c 100644 --- a/code/modules/photography/camera/camera.dm +++ b/code/modules/photography/camera/camera.dm @@ -3,7 +3,7 @@ /obj/item/camera name = "camera" - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/art/camera.dmi' desc = "A polaroid camera." icon_state = "camera" inhand_icon_state = "camera" diff --git a/code/modules/photography/camera/film.dm b/code/modules/photography/camera/film.dm index 2129dbaa289..104cbad3bae 100644 --- a/code/modules/photography/camera/film.dm +++ b/code/modules/photography/camera/film.dm @@ -3,7 +3,7 @@ */ /obj/item/camera_film name = "film cartridge" - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/art/camera.dmi' desc = "A camera film cartridge. Insert it into a camera to reload it." icon_state = "film" inhand_icon_state = "electropack" diff --git a/code/modules/photography/photos/album.dm b/code/modules/photography/photos/album.dm index 4f11647eeb9..215b523ef63 100644 --- a/code/modules/photography/photos/album.dm +++ b/code/modules/photography/photos/album.dm @@ -4,7 +4,7 @@ /obj/item/storage/photo_album name = "photo album" desc = "A big book used to store photos and mementos." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/art/camera.dmi' icon_state = "album" inhand_icon_state = "album" lefthand_file = 'icons/mob/inhands/items/books_lefthand.dmi' diff --git a/code/modules/photography/photos/photo.dm b/code/modules/photography/photos/photo.dm index dba86c6ae01..e83553d35ab 100644 --- a/code/modules/photography/photos/photo.dm +++ b/code/modules/photography/photos/photo.dm @@ -3,7 +3,7 @@ */ /obj/item/photo name = "photo" - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/art/camera.dmi' icon_state = "photo" inhand_icon_state = "paper" w_class = WEIGHT_CLASS_TINY diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 7a03d21afb5..356f3f96f38 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -478,6 +478,7 @@ /obj/item/turret_control name = "turret controls" + icon = 'icons/obj/weapons/hand.dmi' icon_state = "offhand" w_class = WEIGHT_CLASS_HUGE item_flags = ABSTRACT | NOBLUDGEON diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 54057572d8e..c761cee263c 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -202,7 +202,7 @@ /obj/item/reagent_containers/spray/pepper name = "pepperspray" desc = "Manufactured by UhangInc, used to blind and down an opponent quickly." - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/medical/chemical.dmi' icon_state = "pepperspray" inhand_icon_state = "pepperspray" lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' @@ -383,7 +383,7 @@ /obj/item/reagent_containers/spray/chemsprayer/party/spray(atom/A, mob/user) . = ..() icon_state = "[icon_state]_used" - + // Plant-B-Gone /obj/item/reagent_containers/spray/plantbgone // -- Skie diff --git a/code/modules/religion/religion_structures.dm b/code/modules/religion/religion_structures.dm index 73238675619..c823b10b7a8 100644 --- a/code/modules/religion/religion_structures.dm +++ b/code/modules/religion/religion_structures.dm @@ -81,6 +81,7 @@ /obj/item/ritual_totem name = "ritual totem" desc = "A wooden totem with strange carvings on it." + icon = 'icons/obj/hand_of_god_structures.dmi' icon_state = "ritual_totem" inhand_icon_state = "sheet-wood" lefthand_file = 'icons/mob/inhands/items/sheets_lefthand.dmi' diff --git a/code/modules/spells/spell_types/touch/_touch.dm b/code/modules/spells/spell_types/touch/_touch.dm index 6fab59c54ef..efa64437fe5 100644 --- a/code/modules/spells/spell_types/touch/_touch.dm +++ b/code/modules/spells/spell_types/touch/_touch.dm @@ -327,7 +327,7 @@ /obj/item/melee/touch_attack name = "\improper outstretched hand" desc = "High Five?" - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/hand.dmi' lefthand_file = 'icons/mob/inhands/items/touchspell_lefthand.dmi' righthand_file = 'icons/mob/inhands/items/touchspell_righthand.dmi' icon_state = "latexballon" diff --git a/code/modules/spells/spell_types/touch/duffelbag_curse.dm b/code/modules/spells/spell_types/touch/duffelbag_curse.dm index 8725d7daac7..f5ac8a6961d 100644 --- a/code/modules/spells/spell_types/touch/duffelbag_curse.dm +++ b/code/modules/spells/spell_types/touch/duffelbag_curse.dm @@ -82,5 +82,6 @@ /obj/item/melee/touch_attack/duffelbag name = "\improper burdening touch" desc = "Where is the bar from here?" + icon = 'icons/obj/weapons/hand.dmi' icon_state = "duffelcurse" inhand_icon_state = "duffelcurse" diff --git a/code/modules/spells/spell_types/touch/flesh_to_stone.dm b/code/modules/spells/spell_types/touch/flesh_to_stone.dm index a239c09adff..abc60660842 100644 --- a/code/modules/spells/spell_types/touch/flesh_to_stone.dm +++ b/code/modules/spells/spell_types/touch/flesh_to_stone.dm @@ -28,5 +28,6 @@ /obj/item/melee/touch_attack/flesh_to_stone name = "\improper petrifying touch" desc = "That's the bottom line, because flesh to stone said so!" + icon = 'icons/obj/weapons/hand.dmi' icon_state = "fleshtostone" inhand_icon_state = "fleshtostone" diff --git a/code/modules/spells/spell_types/touch/scream_for_me.dm b/code/modules/spells/spell_types/touch/scream_for_me.dm index 7fcee6df843..941885e7577 100644 --- a/code/modules/spells/spell_types/touch/scream_for_me.dm +++ b/code/modules/spells/spell_types/touch/scream_for_me.dm @@ -35,5 +35,6 @@ /obj/item/melee/touch_attack/scream_for_me name = "\improper bloody touch" desc = "Guaranteed to make your victims scream, or your money back!" + icon = 'icons/obj/weapons/hand.dmi' icon_state = "scream_for_me" inhand_icon_state = "disintegrate" diff --git a/code/modules/spells/spell_types/touch/smite.dm b/code/modules/spells/spell_types/touch/smite.dm index f31e844bfb9..bcd234979c6 100644 --- a/code/modules/spells/spell_types/touch/smite.dm +++ b/code/modules/spells/spell_types/touch/smite.dm @@ -54,5 +54,6 @@ /obj/item/melee/touch_attack/smite name = "\improper smiting touch" desc = "This hand of mine glows with an awesome power!" + icon = 'icons/obj/weapons/hand.dmi' icon_state = "disintegrate" inhand_icon_state = "disintegrate" diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index 77323af0145..07d1bebc207 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -456,11 +456,10 @@ GLOBAL_LIST_INIT(english_to_zombie, list()) name = "bananium tongue" desc = "A bananium geode mostly used for honking." say_mod = "honks" - - icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon = 'icons/obj/weapons/horn.dmi' + icon_state = "gold_horn" lefthand_file = 'icons/mob/inhands/equipment/horns_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/horns_righthand.dmi' - icon_state = "gold_horn" /obj/item/organ/internal/tongue/jelly name = "jelly tongue" diff --git a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm index 0f8b6cf1422..aa1354e7690 100644 --- a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm +++ b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm @@ -485,6 +485,7 @@ name = "punching glove" desc = "INCOMING HONKS" throwforce = 35 + icon = 'icons/obj/toys/toy.dmi' icon_state = "punching_glove" /obj/item/punching_glove/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) diff --git a/icons/obj/airlock_machines.dmi b/icons/obj/airlock_machines.dmi index 033e61fae79..e28fde84f0f 100644 Binary files a/icons/obj/airlock_machines.dmi and b/icons/obj/airlock_machines.dmi differ diff --git a/icons/obj/art/camera.dmi b/icons/obj/art/camera.dmi new file mode 100644 index 00000000000..7d7b9a956d5 Binary files /dev/null and b/icons/obj/art/camera.dmi differ diff --git a/icons/obj/art/paint.dmi b/icons/obj/art/paint.dmi new file mode 100644 index 00000000000..8a7c67415b5 Binary files /dev/null and b/icons/obj/art/paint.dmi differ diff --git a/icons/obj/clothing/ears.dmi b/icons/obj/clothing/ears.dmi new file mode 100644 index 00000000000..7171e9fbceb Binary files /dev/null and b/icons/obj/clothing/ears.dmi differ diff --git a/icons/obj/cosmetic.dmi b/icons/obj/cosmetic.dmi new file mode 100644 index 00000000000..c5bd95f6c69 Binary files /dev/null and b/icons/obj/cosmetic.dmi differ diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index b98402328ff..c23e4bffa1c 100644 Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ diff --git a/icons/obj/device_syndie.dmi b/icons/obj/device_syndie.dmi new file mode 100644 index 00000000000..5eaa05d0914 Binary files /dev/null and b/icons/obj/device_syndie.dmi differ diff --git a/icons/obj/hand_of_god_structures.dmi b/icons/obj/hand_of_god_structures.dmi index 1fa38f52bba..3d712eab1dd 100644 Binary files a/icons/obj/hand_of_god_structures.dmi and b/icons/obj/hand_of_god_structures.dmi differ diff --git a/icons/obj/hydroponics/bouquet.dmi b/icons/obj/hydroponics/bouquet.dmi new file mode 100644 index 00000000000..ec11ed4aee3 Binary files /dev/null and b/icons/obj/hydroponics/bouquet.dmi differ diff --git a/icons/obj/hydroponics/equipment.dmi b/icons/obj/hydroponics/equipment.dmi index 2f7b511cdef..dc164c5b1c9 100644 Binary files a/icons/obj/hydroponics/equipment.dmi and b/icons/obj/hydroponics/equipment.dmi differ diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi index 34cf23fc27d..517edbba067 100644 Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi index b92034675b7..a7ba69cdfef 100644 Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ diff --git a/icons/obj/medical/chemical.dmi b/icons/obj/medical/chemical.dmi index ac2c2b6f48e..d8aed182b64 100644 Binary files a/icons/obj/medical/chemical.dmi and b/icons/obj/medical/chemical.dmi differ diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi index 1770f9f92a7..a9e509f41f1 100644 Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ diff --git a/icons/obj/poster.dmi b/icons/obj/poster.dmi index a808dcb1117..d0176a1ac75 100644 Binary files a/icons/obj/poster.dmi and b/icons/obj/poster.dmi differ diff --git a/icons/obj/stack_objects.dmi b/icons/obj/stack_objects.dmi index 8d490229431..fbfc8a6b5b9 100644 Binary files a/icons/obj/stack_objects.dmi and b/icons/obj/stack_objects.dmi differ diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi index 6fdd9711a14..a931c282f4d 100644 Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ diff --git a/icons/obj/toys/toy.dmi b/icons/obj/toys/toy.dmi index 1d94bb1b693..3793ab13360 100644 Binary files a/icons/obj/toys/toy.dmi and b/icons/obj/toys/toy.dmi differ diff --git a/icons/obj/vehicles.dmi b/icons/obj/vehicles.dmi index 58c324db37f..7e2b8a05f20 100644 Binary files a/icons/obj/vehicles.dmi and b/icons/obj/vehicles.dmi differ diff --git a/icons/obj/watercloset.dmi b/icons/obj/watercloset.dmi index 1f07447e969..3358d1e3ea5 100644 Binary files a/icons/obj/watercloset.dmi and b/icons/obj/watercloset.dmi differ diff --git a/icons/obj/weapons/bat.dmi b/icons/obj/weapons/bat.dmi new file mode 100644 index 00000000000..aa7d9cf4149 Binary files /dev/null and b/icons/obj/weapons/bat.dmi differ diff --git a/icons/obj/weapons/baton.dmi b/icons/obj/weapons/baton.dmi new file mode 100644 index 00000000000..e97547d8517 Binary files /dev/null and b/icons/obj/weapons/baton.dmi differ diff --git a/icons/obj/weapons/chainsaw.dmi b/icons/obj/weapons/chainsaw.dmi new file mode 100644 index 00000000000..1d48b63e459 Binary files /dev/null and b/icons/obj/weapons/chainsaw.dmi differ diff --git a/icons/obj/weapons/club.dmi b/icons/obj/weapons/club.dmi new file mode 100644 index 00000000000..616f03f8689 Binary files /dev/null and b/icons/obj/weapons/club.dmi differ diff --git a/icons/obj/weapons/extinguisher.dmi b/icons/obj/weapons/extinguisher.dmi new file mode 100644 index 00000000000..c6954c9deff Binary files /dev/null and b/icons/obj/weapons/extinguisher.dmi differ diff --git a/icons/obj/weapons/grenade.dmi b/icons/obj/weapons/grenade.dmi index 656ad8c2d62..1a6a1d26d97 100644 Binary files a/icons/obj/weapons/grenade.dmi and b/icons/obj/weapons/grenade.dmi differ diff --git a/icons/obj/weapons/hammer.dmi b/icons/obj/weapons/hammer.dmi new file mode 100644 index 00000000000..3e06d9d7def Binary files /dev/null and b/icons/obj/weapons/hammer.dmi differ diff --git a/icons/obj/weapons/hand.dmi b/icons/obj/weapons/hand.dmi new file mode 100644 index 00000000000..5b165b60855 Binary files /dev/null and b/icons/obj/weapons/hand.dmi differ diff --git a/icons/obj/weapons/horn.dmi b/icons/obj/weapons/horn.dmi new file mode 100644 index 00000000000..9f8083f832b Binary files /dev/null and b/icons/obj/weapons/horn.dmi differ diff --git a/icons/obj/weapons/items_and_weapons.dmi b/icons/obj/weapons/items_and_weapons.dmi deleted file mode 100644 index b8687a58b63..00000000000 Binary files a/icons/obj/weapons/items_and_weapons.dmi and /dev/null differ diff --git a/icons/obj/weapons/spear.dmi b/icons/obj/weapons/spear.dmi new file mode 100644 index 00000000000..2598615f92a Binary files /dev/null and b/icons/obj/weapons/spear.dmi differ diff --git a/icons/obj/weapons/staff.dmi b/icons/obj/weapons/staff.dmi new file mode 100644 index 00000000000..ddd567cc337 Binary files /dev/null and b/icons/obj/weapons/staff.dmi differ diff --git a/icons/obj/weapons/sword.dmi b/icons/obj/weapons/sword.dmi new file mode 100644 index 00000000000..0125b604445 Binary files /dev/null and b/icons/obj/weapons/sword.dmi differ diff --git a/icons/obj/weapons/thrown.dmi b/icons/obj/weapons/thrown.dmi new file mode 100644 index 00000000000..e877d12d31b Binary files /dev/null and b/icons/obj/weapons/thrown.dmi differ diff --git a/icons/obj/weapons/whip.dmi b/icons/obj/weapons/whip.dmi new file mode 100644 index 00000000000..b067b11af5b Binary files /dev/null and b/icons/obj/weapons/whip.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 57e8cdf1b5c..68cbd395096 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1764,7 +1764,6 @@ #include "code\game\objects\items\body_egg.dm" #include "code\game\objects\items\bodybag.dm" #include "code\game\objects\items\botpad_remote.dm" -#include "code\game\objects\items\bouquets.dm" #include "code\game\objects\items\boxcutter.dm" #include "code\game\objects\items\broom.dm" #include "code\game\objects\items\cardboard_cutouts.dm" @@ -3426,6 +3425,7 @@ #include "code\modules\holodeck\mobs.dm" #include "code\modules\holodeck\turfs.dm" #include "code\modules\hydroponics\biogenerator.dm" +#include "code\modules\hydroponics\bouquets.dm" #include "code\modules\hydroponics\fermenting_barrel.dm" #include "code\modules\hydroponics\grafts.dm" #include "code\modules\hydroponics\grown.dm"