diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index 7f1201bd12e0..0623c79947d3 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -581,7 +581,7 @@ world A.overlays.Remove(src) /mob/proc/flick_heal_overlay(time, color = "#00FF00") //used for warden and queen healing - var/image/I = image('icons/mob/mob.dmi', src, "heal_overlay") + var/image/I = image('icons/mob/do_afters.dmi', src, "heal_overlay") switch(icon_size) if(48) I.pixel_x = 8 diff --git a/code/game/objects/items/devices/portable_vendor.dm b/code/game/objects/items/devices/portable_vendor.dm index 53f83b110908..cb0e49e2fa98 100644 --- a/code/game/objects/items/devices/portable_vendor.dm +++ b/code/game/objects/items/devices/portable_vendor.dm @@ -6,6 +6,10 @@ name = "\improper Automated Storage Briefcase" desc = "A suitcase-sized automated storage and retrieval system. Designed to efficiently store and selectively dispense small items." icon = 'icons/obj/items/storage/briefcases.dmi' + item_icons = list( + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/equipment/briefcases_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/equipment/briefcases_righthand.dmi' + ) icon_state = "secure" flags_atom = FPRINT|CONDUCT force = 8 diff --git a/code/game/objects/items/props/helmetgarb.dm b/code/game/objects/items/props/helmetgarb.dm index aec498b5847a..4b11fd69e6f9 100644 --- a/code/game/objects/items/props/helmetgarb.dm +++ b/code/game/objects/items/props/helmetgarb.dm @@ -662,6 +662,7 @@ name = "compass" desc = "It always faces north. Are you sure it is not broken?" icon = 'icons/obj/items/tools.dmi' + icon_state = "compass" item_icons = list( WEAR_AS_GARB = 'icons/mob/humans/onmob/clothing/helmet_garb/misc.dmi', ) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index aaf763642f20..227a977b3f9e 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -935,6 +935,7 @@ w_class = SIZE_LARGE storage_slots = 12 storage_flags = STORAGE_FLAGS_DEFAULT|STORAGE_USING_DRAWING_METHOD|STORAGE_ALLOW_QUICKDRAW + flags_atom = FPRINT // has gamemode skin max_w_class = SIZE_SMALL max_storage_space = 48 can_hold = list( diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm index fab4fbd8bc76..3043412170a0 100644 --- a/code/game/objects/items/storage/briefcase.dm +++ b/code/game/objects/items/storage/briefcase.dm @@ -2,6 +2,10 @@ name = "briefcase" desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional." icon = 'icons/obj/items/storage/briefcases.dmi' + item_icons = list( + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/equipment/briefcases_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/equipment/briefcases_righthand.dmi' + ) icon_state = "briefcase" item_state = "briefcase" flags_atom = FPRINT|CONDUCT|NO_GAMEMODE_SKIN diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index 1aad5f1f71f0..9b1b0e251fb6 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -124,6 +124,10 @@ /obj/item/storage/secure/briefcase name = "secure briefcase" icon = 'icons/obj/items/storage/briefcases.dmi' + item_icons = list( + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/equipment/briefcases_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/equipment/briefcases_righthand.dmi' + ) icon_state = "secure" item_state = "sec-case" desc = "A large briefcase with a digital locking system." diff --git a/code/game/objects/items/storage/smartpack.dm b/code/game/objects/items/storage/smartpack.dm index 997a1e51a830..56f5715e964e 100644 --- a/code/game/objects/items/storage/smartpack.dm +++ b/code/game/objects/items/storage/smartpack.dm @@ -16,7 +16,7 @@ icon_state = "smartpack" icon = 'icons/obj/items/clothing/backpack/smartpack.dmi' item_icons = list( - WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/backpacks_by_faction/UA.dmi' + WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/smartpack.dmi' ) flags_atom = FPRINT|NO_GAMEMODE_SKIN // same sprite for all gamemodes max_storage_space = 14 diff --git a/code/game/objects/items/tools/maintenance_tools.dm b/code/game/objects/items/tools/maintenance_tools.dm index 2726459e5a61..0c00646c9210 100644 --- a/code/game/objects/items/tools/maintenance_tools.dm +++ b/code/game/objects/items/tools/maintenance_tools.dm @@ -47,6 +47,11 @@ name = "screwdriver" desc = "You can be totally screwy with this." icon = 'icons/obj/items/tools.dmi' + item_icons = list( + WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/objects.dmi', + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/equipment/tools_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/equipment/tools_righthand.dmi', + ) icon_state = "screwdriver" pickup_sound = 'sound/handling/multitool_pickup.ogg' drop_sound = 'sound/handling/screwdriver_drop.ogg' diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index f2ae9860cbb6..eabbd919c534 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -44,6 +44,10 @@ name = "telescopic baton" desc = "A compact yet rebalanced personal defense weapon. Can be concealed when folded. It will knock down humans when not on harm intent." icon = 'icons/obj/items/weapons/melee/non_lethal.dmi' + item_icons = list( + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/non_lethal_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/non_lethal_righthand.dmi' + ) icon_state = "telebaton_0" item_state = "telebaton_0" flags_equip_slot = SLOT_WAIST diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm index 67a6dc45561b..cf2911efda52 100644 --- a/code/modules/clothing/head/head.dm +++ b/code/modules/clothing/head/head.dm @@ -44,7 +44,7 @@ icon_state = "band2" icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi' item_icons = list( - WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi' + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi' ) flags_atom = null @@ -123,7 +123,7 @@ icon_state = "berettan" icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi' item_icons = list( - WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi' + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi' ) /obj/item/clothing/head/beret/cm/tan/Initialize(mapload, ...) @@ -152,6 +152,7 @@ /obj/item/clothing/head/beret/cm/squadberet name = "USCM Squad Beret" desc = "For those who want to show pride and have nothing to lose (in their head, at least)." + flags_atom = NO_GAMEMODE_SKIN /obj/item/clothing/head/beret/cm/white/civilian name = "White Beret" @@ -209,7 +210,7 @@ icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi' flags_obj = OBJ_NO_HELMET_BAND|OBJ_IS_HELMET_GARB item_icons = list( - WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi', + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi', WEAR_AS_GARB = 'icons/mob/humans/onmob/clothing/helmet_garb/headbands.dmi', ) item_state_slots = list(WEAR_AS_GARB = "headbandgreen") @@ -284,7 +285,7 @@ icon = 'icons/obj/items/clothing/hats/headbands.dmi' icon_state = null item_icons = list( - WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi', + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/headbands.dmi', WEAR_AS_GARB = 'icons/mob/humans/onmob/clothing/helmet_garb/headbands.dmi', ) item_state_slots = null @@ -393,7 +394,7 @@ GLOBAL_LIST_INIT(allowed_hat_items, list( icon_state = "cap" icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi' item_icons = list( - WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi', + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi', WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi', WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi' ) @@ -664,7 +665,7 @@ GLOBAL_LIST_INIT(allowed_hat_items, list( icon_state = "coberet" icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi' item_icons = list( - WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi' + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi' ) black_market_value = 30 @@ -966,7 +967,7 @@ GLOBAL_LIST_INIT(allowed_hat_items, list( icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi' flags_inv_hide = HIDETOPHAIR item_icons = list( - WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi', + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi', WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi', WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi' ) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 099304307c56..e7f78ecbf0dc 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -101,7 +101,7 @@ . = ..() select_gamemode_skin(/obj/item/clothing/suit/armor/vest/pilot) -/obj/item/clothing/suit/armor/vest/pilot/marine/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection) +/obj/item/clothing/suit/armor/vest/pilot/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection) . = ..() switch(SSmapping.configs[GROUND_MAP].camouflage_type) if("jungle") diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index e46a896fb54b..d50f42c90639 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -151,6 +151,11 @@ name = "snow suit" desc = "A standard snow suit. It can protect the wearer from extreme cold." icon = 'icons/obj/items/clothing/suits/coats_robes.dmi' + item_icons = list( + WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/coats_robes.dmi', + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/clothing/suits_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/clothing/suits_righthand.dmi', + ) icon_state = "snowsuit" flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS @@ -299,7 +304,7 @@ /obj/item/device/walkman, ) item_icons = list( - WEAR_BODY = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UPP.dmi' + WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UPP.dmi' ) @@ -309,7 +314,7 @@ icon_state = "snowsuit_liaison" icon = 'icons/obj/items/clothing/suits/suits_by_faction/WY.dmi' item_icons = list( - WEAR_BODY = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/WY.dmi' + WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/WY.dmi' ) /obj/item/clothing/suit/storage/snow_suit/liaison/modified diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index 1584cb023063..a1605ed56d17 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -21,6 +21,7 @@ siemens_coefficient = 0.9 ///Makes it so that we can see the right name in the vendor. var/specialty = "USCM" + var/snow_name = " snow uniform" layer = UPPER_ITEM_LAYER item_icons = list( WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/jungle.dmi', @@ -34,7 +35,7 @@ if(!(flags_atom & NO_NAME_OVERRIDE)) name = "[specialty]" if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - name += " snow uniform" + name += snow_name else name += " uniform" if(!(flags_atom & NO_GAMEMODE_SKIN)) @@ -190,7 +191,10 @@ worn_state = "pilot_flightsuit" flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE flags_cold_protection = ICE_PLANET_MIN_COLD_PROT + specialty = "pilot officer" + snow_name = " snow bodysuit" suit_restricted = list(/obj/item/clothing/suit/armor/vest/pilot, /obj/item/clothing/suit/storage/marine/light/vest/dcc, /obj/item/clothing/suit/storage/jacket/marine/pilot, /obj/item/clothing/suit/storage/marine/light/vest) + flags_atom = FPRINT /obj/item/clothing/under/marine/officer/pilot/flight name = "tactical pilot officer flightsuit" diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index c54bfe1a98b7..76e667a0e286 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -993,6 +993,11 @@ /obj/item/clothing/accessory/holobadge/cord icon_state = "holobadge-cord" flags_equip_slot = SLOT_FACE + accessory_icons = list( + WEAR_FACE = 'icons/mob/humans/onmob/clothing/accessory/misc.dmi', + WEAR_BODY = 'icons/mob/humans/onmob/clothing/accessory/misc.dmi', + WEAR_JACKET = 'icons/mob/humans/onmob/clothing/accessory/misc.dmi' + ) /obj/item/clothing/accessory/holobadge/attack_self(mob/user) ..() diff --git a/code/modules/cm_aliens/XenoStructures.dm b/code/modules/cm_aliens/XenoStructures.dm index b8897217c337..138e0a32cf53 100644 --- a/code/modules/cm_aliens/XenoStructures.dm +++ b/code/modules/cm_aliens/XenoStructures.dm @@ -15,7 +15,7 @@ /obj/effect/alien/resin name = "resin" desc = "Looks like some kind of slimy growth." - icon_state = "Resin1" + icon_state = "weeds" anchored = TRUE health = 200 unacidable = TRUE diff --git a/code/modules/cm_marines/Donator_Items.dm b/code/modules/cm_marines/Donator_Items.dm index 6702d30fccb6..669220f5f9c5 100644 --- a/code/modules/cm_marines/Donator_Items.dm +++ b/code/modules/cm_marines/Donator_Items.dm @@ -12,6 +12,9 @@ item_state = null //DON'T GRAB STUFF BETWEEN THIS LINE icon = 'icons/obj/items/clothing/hats/donator.dmi' + item_icons = list( + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/donator.dmi' + ) flags_inventory = BLOCKSHARPOBJ flags_inv_hide = HIDEEARS flags_atom = FPRINT|CONDUCT|NO_NAME_OVERRIDE|NO_GAMEMODE_SKIN diff --git a/code/modules/cm_marines/m2c.dm b/code/modules/cm_marines/m2c.dm index f3aa785e2532..df4c19317ecc 100644 --- a/code/modules/cm_marines/m2c.dm +++ b/code/modules/cm_marines/m2c.dm @@ -47,6 +47,11 @@ w_class = SIZE_HUGE flags_equip_slot = SLOT_BACK icon = 'icons/obj/items/weapons/guns/guns_by_faction/USCM/machineguns.dmi' + item_icons = list( + WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/guns_by_type/machineguns.dmi', + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/weapons/guns/machineguns_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/guns/machineguns_righthand.dmi' + ) icon_state = "M2C_gun_mount" item_state = "M2C_gun_mount" var/rounds = 0 diff --git a/code/modules/cm_marines/smartgun_mount.dm b/code/modules/cm_marines/smartgun_mount.dm index a5f6f30a6ec1..2e3588e81cff 100644 --- a/code/modules/cm_marines/smartgun_mount.dm +++ b/code/modules/cm_marines/smartgun_mount.dm @@ -42,6 +42,11 @@ w_class = SIZE_HUGE flags_equip_slot = SLOT_BACK icon = 'icons/obj/items/weapons/guns/guns_by_faction/USCM/machineguns.dmi' + item_icons = list( + WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/guns_by_type/machineguns.dmi', + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/weapons/guns/machineguns_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/guns/machineguns_righthand.dmi' + ) icon_state = "M56D_gun_e" ///How many rounds are in the weapon. This is useful if we break down our guns. var/rounds = 0 diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 3a1a840c5eed..4c4c21726cd4 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -282,6 +282,7 @@ Defined in conflicts.dm of the #defines folder. icon_state = "bayonet" item_state = "combat_knife" item_icons = list( + WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/objects.dmi', WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/knives_lefthand.dmi', WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/knives_righthand.dmi' ) diff --git a/icons/mob/humans/onmob/clothing/back/guns_by_type/machineguns.dmi b/icons/mob/humans/onmob/clothing/back/guns_by_type/machineguns.dmi index cfbc524e621e..a02099b9fbfe 100644 Binary files a/icons/mob/humans/onmob/clothing/back/guns_by_type/machineguns.dmi and b/icons/mob/humans/onmob/clothing/back/guns_by_type/machineguns.dmi differ diff --git a/icons/mob/humans/onmob/clothing/masks/objects.dmi b/icons/mob/humans/onmob/clothing/masks/objects.dmi index 6e85a4d52d32..a9910d35ab44 100644 Binary files a/icons/mob/humans/onmob/clothing/masks/objects.dmi and b/icons/mob/humans/onmob/clothing/masks/objects.dmi differ diff --git a/icons/mob/humans/onmob/inhands/equipment/briefcases_lefthand.dmi b/icons/mob/humans/onmob/inhands/equipment/briefcases_lefthand.dmi index e6f511c03610..8dd37eabe25a 100644 Binary files a/icons/mob/humans/onmob/inhands/equipment/briefcases_lefthand.dmi and b/icons/mob/humans/onmob/inhands/equipment/briefcases_lefthand.dmi differ diff --git a/icons/mob/humans/onmob/inhands/equipment/briefcases_righthand.dmi b/icons/mob/humans/onmob/inhands/equipment/briefcases_righthand.dmi index 95a2586a382b..c72bb48a2ff5 100644 Binary files a/icons/mob/humans/onmob/inhands/equipment/briefcases_righthand.dmi and b/icons/mob/humans/onmob/inhands/equipment/briefcases_righthand.dmi differ diff --git a/icons/mob/xenonids/Effects.dmi b/icons/mob/xenonids/Effects.dmi index ad7c8d247450..1fa461e18abb 100644 Binary files a/icons/mob/xenonids/Effects.dmi and b/icons/mob/xenonids/Effects.dmi differ diff --git a/icons/mob/xenos/effects.dmi b/icons/mob/xenos/effects.dmi index dfdcbf95d54b..b36ed404db4f 100644 Binary files a/icons/mob/xenos/effects.dmi and b/icons/mob/xenos/effects.dmi differ diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm index a7258d69b201..a31a6b6358e9 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -3099,11 +3099,7 @@ /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) "bJp" = ( -/obj/item/storage/backpack/marine/satchel{ - desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; - icon = 'icons/obj/janitor.dmi'; - icon_state = "trashbag3"; - name = "trash bag"; +/obj/item/storage/bag/trash{ pixel_x = -4; pixel_y = 6 }, @@ -5141,7 +5137,7 @@ /area/lv522/atmos/command_centre) "cQm" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; @@ -8005,19 +8001,11 @@ /turf/open/floor/corsat/squares, /area/lv522/atmos/cargo_intake) "eju" = ( -/obj/item/storage/backpack/marine/satchel{ - desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; - icon = 'icons/obj/janitor.dmi'; - icon_state = "trashbag3"; - name = "trash bag"; +/obj/item/storage/bag/trash{ pixel_x = -4; pixel_y = 6 }, -/obj/item/storage/backpack/marine/satchel{ - desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; - icon = 'icons/obj/janitor.dmi'; - icon_state = "trashbag3"; - name = "trash bag"; +/obj/item/storage/bag/trash{ pixel_x = 3; pixel_y = -2 }, @@ -13160,7 +13148,7 @@ /area/lv522/landing_zone_1/tunnel) "hgM" = ( /obj/structure/closet/crate/trashcart, -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; @@ -13568,7 +13556,7 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/c_block/mining) "hvE" = ( -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; @@ -13626,7 +13614,7 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_street) "hxY" = ( -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; @@ -16278,7 +16266,7 @@ /turf/open/floor/prison/blue_plate/north, /area/lv522/indoors/a_block/hallway) "iVm" = ( -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; @@ -17710,7 +17698,7 @@ /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/south) "jGa" = ( -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; @@ -18002,7 +17990,7 @@ /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) "jOw" = ( -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; @@ -18010,7 +17998,7 @@ pixel_x = -4; pixel_y = 6 }, -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; @@ -21642,12 +21630,12 @@ /turf/open/floor/prison, /area/lv522/outdoors/colony_streets/containers) "lFO" = ( -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; - layer = 3.1; name = "trash bag"; + layer = 3.1; pixel_x = -4; pixel_y = 2 }, @@ -23700,12 +23688,12 @@ /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/mining) "mJQ" = ( -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; - layer = 3.1; name = "trash bag"; + layer = 3.1; pixel_x = 2; pixel_y = 20 }, @@ -26004,7 +25992,7 @@ /turf/open/asphalt/cement/cement4, /area/lv522/outdoors/colony_streets/north_west_street) "nQQ" = ( -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; @@ -26246,7 +26234,7 @@ /turf/open/floor/prison/darkyellowfull2/east, /area/lv522/indoors/lone_buildings/outdoor_bot) "nWq" = ( -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; @@ -26407,11 +26395,7 @@ /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/south) "oaq" = ( -/obj/item/storage/backpack/marine/satchel{ - desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; - icon = 'icons/obj/janitor.dmi'; - icon_state = "trashbag3"; - name = "trash bag"; +/obj/item/storage/bag/trash{ pixel_x = -4; pixel_y = 6 }, @@ -26980,7 +26964,7 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/corpo) "opt" = ( -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; @@ -26988,7 +26972,7 @@ pixel_x = -4; pixel_y = 6 }, -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; @@ -29521,12 +29505,12 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms) "pOm" = ( -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; - layer = 3.1; name = "trash bag"; + layer = 3.1; pixel_x = 4; pixel_y = 21 }, @@ -31493,7 +31477,7 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_west_street) "qKr" = ( -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; @@ -31545,7 +31529,7 @@ /turf/open/floor/strata/white_cyan1, /area/lv522/indoors/lone_buildings/chunk) "qLQ" = ( -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; @@ -33886,7 +33870,7 @@ /turf/open/floor/shiva/radiator_tile2, /area/lv522/indoors/a_block/hallway) "rMz" = ( -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; @@ -36141,7 +36125,7 @@ /turf/open/gm/river, /area/lv522/oob) "sRY" = ( -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; @@ -40752,7 +40736,7 @@ /turf/open/floor/corsat/marked, /area/lv522/indoors/c_block/mining) "vfC" = ( -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; @@ -40760,7 +40744,7 @@ pixel_x = -4; pixel_y = 6 }, -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; @@ -43681,7 +43665,7 @@ }, /area/lv522/landing_zone_forecon/UD6_Tornado) "wzt" = ( -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 52a93e2c0b98..95047cd617bd 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -35620,7 +35620,7 @@ /turf/open/floor/almayer/dark_sterile, /area/almayer/command/corporateliaison) "kOJ" = ( -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; @@ -52580,7 +52580,7 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/lower/l_a_p) "rJh" = ( -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; @@ -52588,7 +52588,7 @@ pixel_x = -4; pixel_y = 6 }, -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; @@ -54260,7 +54260,7 @@ /area/almayer/shipboard/brig/evidence_storage) "ssk" = ( /obj/structure/surface/rack, -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; @@ -54268,7 +54268,7 @@ pixel_x = -4; pixel_y = 6 }, -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; diff --git a/maps/templates/lazy_templates/pizza_ert_station.dmm b/maps/templates/lazy_templates/pizza_ert_station.dmm index 98e5dec44fec..dc9cd06a1ac2 100644 --- a/maps/templates/lazy_templates/pizza_ert_station.dmm +++ b/maps/templates/lazy_templates/pizza_ert_station.dmm @@ -1642,7 +1642,7 @@ /area/adminlevel/ert_station/pizza_station) "vI" = ( /obj/structure/disposalpipe/segment, -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3"; @@ -1650,7 +1650,7 @@ pixel_x = -1; pixel_y = 6 }, -/obj/item/storage/backpack/marine/satchel{ +/obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; icon = 'icons/obj/janitor.dmi'; icon_state = "trashbag3";