diff --git a/aurorastation.dme b/aurorastation.dme index da547583ccd..703d9336905 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1688,6 +1688,7 @@ #include "code\modules\compass\compass_holder.dm" #include "code\modules\compass\compass_waypoint.dm" #include "code\modules\compass\~compass.dm" +#include "code\modules\cooking\plasticbag.dm" #include "code\modules\cooking\trays.dm" #include "code\modules\cooking\machinery\gibber.dm" #include "code\modules\cooking\machinery\icecream.dm" diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index fca2e32cc6c..98e9b37699f 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -921,6 +921,7 @@ /obj/item/reagent_containers/ladle = 4, /obj/item/storage/toolbox/lunchbox/nt = 6, /obj/item/reagent_containers/glass/rag = 8, + /obj/item/evidencebag/plasticbag = 6, /obj/item/tray = 12, ) contraband = list( diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm index e5d6616cdc5..c9fd1903ec9 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm @@ -156,6 +156,10 @@ path = /obj/item/clothing/accessory/buddytag cost = 2 +/datum/gear/utility/plasticbag + display_name = "resealable plastic bag" + path = /obj/item/evidencebag/plasticbag + /datum/gear/utility/buddy_tag/New() ..() gear_tweaks += new /datum/gear_tweak/buddy_tag_config() \ No newline at end of file diff --git a/code/modules/cooking/plasticbag.dm b/code/modules/cooking/plasticbag.dm new file mode 100644 index 00000000000..7ae6bc578d9 --- /dev/null +++ b/code/modules/cooking/plasticbag.dm @@ -0,0 +1,32 @@ +/obj/item/evidencebag/plasticbag + name = "resealable plastic bag" + desc = "An Idris Quiklok plastic bag." + +/obj/item/evidencebag/plasticbag/attack_self(mob/user as mob) + if(contents.len) + var/obj/item/I = contents[1] + user.visible_message("[user] takes \the [I] out of \the [src].", SPAN_NOTICE("You take \the [I] out of \the [src]."),\ + "You hear someone rustle around in a plastic bag, and remove something.") + cut_overlays() //remove the overlays + + user.put_in_hands(I) + stored_item = null + + w_class = initial(w_class) + icon_state = "evidenceobj" + desc = "An empty Idris Quicklok plastic bag." + else + to_chat(user, "[src] is empty.") + icon_state = "evidenceobj" + return + +/obj/item/storage/box/plasticbag + name = "resealable plastic bag box" + desc = "A box advertising its dazzling contents. Six resealable Idris Incorporated brand Quiklok bags!" + illustration = "evidence" + storage_slots = 6 + +/obj/item/storage/box/plasticbag/fill() + ..() + for(var/i=0;iYou find putting an evidence bag in another evidence bag to be slightly absurd.") + to_chat(user, "You find putting a plastic bag in another plastic bag to be slightly absurd and think better of it.") return if(I.w_class > 3) @@ -71,7 +71,7 @@ MA.layer = FLOAT_LAYER add_overlay(list(MA, "evidence")) - desc = "An evidence bag containing [I]." + desc = "A plastic bag containing [I]." I.forceMove(src) stored_item = I w_class = I.w_class diff --git a/html/changelogs/wickedcybs_plasticbag.yml b/html/changelogs/wickedcybs_plasticbag.yml new file mode 100644 index 00000000000..27131a6a835 --- /dev/null +++ b/html/changelogs/wickedcybs_plasticbag.yml @@ -0,0 +1,6 @@ +author: WickedCybs + +delete-after: True + +changes: + - rscadd: "Makes an evidence bag variant called 'resealable plastic bag' and adds some to the kitchen and loadout. Now you too, can store your sandwich properly." \ No newline at end of file diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 7ac6d20cf9f..3e40f7496ee 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -24486,6 +24486,10 @@ "njB" = ( /obj/structure/table/stone/marble, /obj/effect/floor_decal/corner/grey/diagonal, +/obj/item/storage/box/plasticbag{ + pixel_x = 5; + pixel_y = 9 + }, /turf/simulated/floor/tiled/white, /area/horizon/kitchen) "njF" = (