diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index da250477491..a5955db1157 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -82,6 +82,8 @@ name = "compression box of invisible outfits" desc = "a box with bluespace compression technology that nanotrasen has approved, but this is extremely heavy... If you're glued with this box, pull out of the contents and fold the box." w_class = WEIGHT_CLASS_HUGE + item_flags = SLOWS_WHILE_IN_HAND + slowdown = 4 drag_slowdown = 4 // do not steal by dragging /* Note for the compression box: Do not put any box (or suit) into this box, or it will allow infinite storage. @@ -89,19 +91,6 @@ nor it will allow a glitch when you can access different boxes at the same time. examples exist in `closets/secure/security.dm` */ -/obj/item/storage/box/suitbox/pickup(mob/user) - . = ..() - user.add_movespeed_modifier(MOVESPEED_ID_SLOW_SUITBOX, update=TRUE, priority=100, multiplicative_slowdown=4) - -/obj/item/storage/box/suitbox/dropped(mob/living/user) - ..() - var/box_exists = FALSE - for(var/obj/item/storage/box/suitbox/B in user.get_contents()) - box_exists = TRUE // `var/obj/item/storage/box/suitbox/B` is already type check - break - if(!box_exists) - user.remove_movespeed_modifier(MOVESPEED_ID_SLOW_SUITBOX, TRUE) - /obj/item/storage/box/suitbox/wardrobe // for `wardrobe.dm` name = "compression box of crew outfits" var/list/repeated_items = list( // just as a sample diff --git a/nsv13.dme b/nsv13.dme index 48d6e201164..bbe1c789705 100644 --- a/nsv13.dme +++ b/nsv13.dme @@ -3847,6 +3847,8 @@ #include "nsv13\code\modules\cargo\exports\syndie.dm" #include "nsv13\code\modules\client\zoom.dm" #include "nsv13\code\modules\client\loadout\loadout_donator.dm" +#include "nsv13\code\modules\client\loadout\loadout_general.dm" +#include "nsv13\code\modules\client\loadout\loadout_uniform.dm" #include "nsv13\code\modules\clothing\custom_clothes.dm" #include "nsv13\code\modules\clothing\custom_outfits.dm" #include "nsv13\code\modules\clothing\dominion_clothes.dm" diff --git a/nsv13/code/game/objects/items/storage_items.dm b/nsv13/code/game/objects/items/storage_items.dm index 7561c2e6248..20a0a1f9990 100644 --- a/nsv13/code/game/objects/items/storage_items.dm +++ b/nsv13/code/game/objects/items/storage_items.dm @@ -46,3 +46,14 @@ new /obj/item/reagent_containers/glass/beaker/large( src ) for(var/i in 1 to 5) new /obj/item/reagent_containers/glass/beaker( src ) + +/obj/item/storage/box/suitbox/maid + name = "compression box of maid uniforms" + desc = "Contains a state of the art maid uniform." + +/obj/item/storage/box/suitbox/maid/PopulateContents() + new /obj/item/clothing/head/maidheadband(src) + new /obj/item/clothing/neck/maid(src) + new /obj/item/clothing/gloves/maid(src) + new /obj/item/clothing/under/costume/maid(src) + diff --git a/nsv13/code/modules/client/loadout/loadout_general.dm b/nsv13/code/modules/client/loadout/loadout_general.dm new file mode 100644 index 00000000000..42c868d8bbf --- /dev/null +++ b/nsv13/code/modules/client/loadout/loadout_general.dm @@ -0,0 +1,5 @@ +/datum/gear/misc/maid + display_name = "maid uniform" + path = /obj/item/storage/box/suitbox/maid + cost = 5000 + diff --git a/nsv13/code/modules/client/loadout/loadout_uniform.dm b/nsv13/code/modules/client/loadout/loadout_uniform.dm new file mode 100644 index 00000000000..7becfbc4a4f --- /dev/null +++ b/nsv13/code/modules/client/loadout/loadout_uniform.dm @@ -0,0 +1,4 @@ +/datum/gear/uniform/skirt/black + display_name = "skirt, black" + path = /obj/item/clothing/under/dress/skirt +