Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds the black skirt and maid outfit to the torp shop #2473

Merged
merged 4 commits into from
Aug 11, 2023
Merged

Adds the black skirt and maid outfit to the torp shop #2473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
182e93c
skirt + maid outfit
DrSirKnight Jul 12, 2023
485eb60
Fixes suitbox not taking away slowdown when a box is flattened into c…
DrSirKnight Jul 30, 2023
ef98f71
SUITBOXES ARE TERRIBLE
DrSirKnight Jul 30, 2023
a11343f
Fixes your stuff
Bokkiewokkie Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions code/game/objects/items/storage/boxes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,26 +82,15 @@
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.
non-storage items are only legit for this box. (suits are storage too, so, no.)
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
Expand Down
2 changes: 2 additions & 0 deletions nsv13.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
11 changes: 11 additions & 0 deletions nsv13/code/game/objects/items/storage_items.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

5 changes: 5 additions & 0 deletions nsv13/code/modules/client/loadout/loadout_general.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/datum/gear/misc/maid
display_name = "maid uniform"
path = /obj/item/storage/box/suitbox/maid
cost = 5000

4 changes: 4 additions & 0 deletions nsv13/code/modules/client/loadout/loadout_uniform.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/datum/gear/uniform/skirt/black
display_name = "skirt, black"
path = /obj/item/clothing/under/dress/skirt

Loading