Skip to content

Loadout Changes #89

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

Open
KromeAngel wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Loadout Changes #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00da068
Changes
KromeAngel Jun 6, 2022
c3b6f8e
Tying up loose ends
KromeAngel Jun 8, 2022
e831998
hands.dm shuffle
KromeAngel Jun 8, 2022
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
2 changes: 1 addition & 1 deletion code/game/objects/items/miscellaneous.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
/obj/item/choice_beacon/box/carpet //donator carpet beacon
name = "choice box (carpet)"
desc = "Contains 50 of a selected carpet inside!"
var/static/list/carpet_list = list(/obj/item/stack/tile/carpet/black/fifty = "Black Carpet",
var/static/list/carpet_list = list("Black Carpet" = /obj/item/stack/tile/carpet/black/fifty,
"Black & Red Carpet" = /obj/item/stack/tile/carpet/blackred/fifty,
"Monochrome Carpet" = /obj/item/stack/tile/carpet/monochrome/fifty,
"Blue Carpet" = /obj/item/stack/tile/carpet/blue/fifty,
Expand Down
13 changes: 7 additions & 6 deletions modular_lumos/code/modules/client/loadout/accessories.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,22 @@
category = LOADOUT_CATEGORY_GLOVES
slot = SLOT_GLOVES

/datum/gear/accessories/ring/goldring
name = "A gold ring"
path = /obj/item/clothing/accessory/ring
cost = 2

/datum/gear/accessories/ring/silverring
name = "A silver ring"
path = /obj/item/clothing/accessory/ring/silver
cost = 2

/datum/gear/accessories/ring/goldring
name = "A gold ring"
path = /obj/item/clothing/accessory/ring
cost = 4

/datum/gear/accessories/ring/diamondring
name = "A diamond ring"
path = /obj/item/clothing/accessory/ring/diamond
cost = 4
cost = 6

/datum/gear/accessories/ring/customring
name = "A ring, renameable"
path = /obj/item/clothing/accessory/ring/custom
cost = 2
134 changes: 39 additions & 95 deletions modular_lumos/code/modules/client/loadout/backpack.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,110 +6,34 @@
/datum/gear/backpack/plushbox
name = "Plushie Choice Box"
path = /obj/item/choice_beacon/box/plushie
cost = 4
subcategory = LOADOUT_SUBCATEGORY_BACKPACK_TOYS

/datum/gear/backpack/tennis
name = "Polychromic Tennis Ball"
path = /obj/item/toy/fluff/tennis_poly
subcategory = LOADOUT_SUBCATEGORY_BACKPACK_TOYS

/datum/gear/backpack/tennis/red
name = "Red Tennis Ball"
path = /obj/item/toy/fluff/tennis_poly/red

/datum/gear/backpack/tennis/yellow
name = "Yellow Tennis Ball"
path = /obj/item/toy/fluff/tennis_poly/yellow

/datum/gear/backpack/tennis/green
name = "Green Tennis Ball"
path = /obj/item/toy/fluff/tennis_poly/green

/datum/gear/backpack/tennis/cyan
name = "Cyan Tennis Ball"
path = /obj/item/toy/fluff/tennis_poly/cyan

/datum/gear/backpack/tennis/blue
name = "Blue Tennis Ball"
path = /obj/item/toy/fluff/tennis_poly/blue

/datum/gear/backpack/tennis/purple
name = "Purple Tennis Ball"
path = /obj/item/toy/fluff/tennis_poly/purple

/datum/gear/backpack/tennis/tri
name = "Tri-color Polychromic Tennis Ball"
path = /obj/item/toy/fluff/tennis_poly/tri
cost = 3

/datum/gear/backpack/tennis/tri/squeak
name = "Squeakable Tri-color Polychromic Tennis Ball"
name = "Squeakable Tri-color Tennis Ball"
path = /obj/item/toy/fluff/tennis_poly/tri/squeak
cost = 6
cost = 3

/datum/gear/backpack/bone
name = "Polychromic Bone"
path = /obj/item/toy/fluff/bone_poly
subcategory = LOADOUT_SUBCATEGORY_BACKPACK_TOYS

/datum/gear/backpack/bone/red
name = "Red Polychromic Bone"
path = /obj/item/toy/fluff/bone_poly/red

/datum/gear/backpack/bone/yellow
name = "Yellow Polychromic Bone"
path = /obj/item/toy/fluff/bone_poly/yellow

/datum/gear/backpack/bone/green
name = "Green Polychromic Bone"
path = /obj/item/toy/fluff/bone_poly/green

/datum/gear/backpack/bone/cyan
name = "Cyan Polychromic Bone"
path = /obj/item/toy/fluff/bone_poly/cyan

/datum/gear/backpack/bone/blue
name = "Blue Polychromic Bone"
path = /obj/item/toy/fluff/bone_poly/blue

/datum/gear/backpack/bone/purple
name = "Purple Polychromic Bone"
path = /obj/item/toy/fluff/bone_poly/purple

/datum/gear/backpack/bone/squeak
name = "Squeakable Polychromic Bone"
path = /obj/item/toy/fluff/bone_poly/squeak
cost = 6
cost = 3

/datum/gear/backpack/frisbee
name = "Polychromic Frisbee"
path = /obj/item/toy/fluff/frisbee_poly
subcategory = LOADOUT_SUBCATEGORY_BACKPACK_TOYS

/datum/gear/backpack/frisbee/red
name = "Red Polychromic Frisbee"
path = /obj/item/toy/fluff/frisbee_poly/red

/datum/gear/backpack/frisbee/yellow
name = "Yellow Polychromic Frisbee"
path = /obj/item/toy/fluff/frisbee_poly/yellow

/datum/gear/backpack/frisbee/green
name = "Green Polychromic Frisbee"
path = /obj/item/toy/fluff/frisbee_poly/green

/datum/gear/backpack/frisbee/cyan
name = "Cyan Polychromic Frisbee"
path = /obj/item/toy/fluff/frisbee_poly/cyan

/datum/gear/backpack/frisbee/blue
name = "Blue Polychromic Frisbee"
path = /obj/item/toy/fluff/frisbee_poly/blue

/datum/gear/backpack/frisbee/purple
name = "Purple Polychromic Frisbee"
path = /obj/item/toy/fluff/frisbee_poly/purple

/datum/gear/backpack/dildo
name = "Customizable dildo"
path = /obj/item/dildo/custom
Expand Down Expand Up @@ -147,6 +71,25 @@
path = /obj/item/pen/fountain
cost = 2

/datum/gear/backpack/necklace//this is here because loadout doesn't support proper accessories
name = "A renameable necklace"
path = /obj/item/clothing/accessory/necklace

/datum/gear/backpack/ringbox_silver
name = "A silver ring box"
path = /obj/item/storage/fancy/ringbox/silver
cost = 2

/datum/gear/backpack/ringbox_gold
name = "A gold ring box"
path = /obj/item/storage/fancy/ringbox
cost = 4

/datum/gear/backpack/ringbox_diamond
name = "A diamond ring box"
path = /obj/item/storage/fancy/ringbox/diamond
cost = 6

/datum/gear/backpack/modular_tablet
name = "A modular tablet"
path = /obj/item/modular_computer/tablet/preset/cheap/
Expand All @@ -157,21 +100,22 @@
path = /obj/item/modular_computer/laptop/preset/civilian
cost = 7

/datum/gear/backpack/ringbox_gold
name = "A gold ring box"
path = /obj/item/storage/fancy/ringbox
cost = 3

/datum/gear/backpack/ringbox_silver
name = "A silver ring box"
path = /obj/item/storage/fancy/ringbox/silver
cost = 3
//Lumos change

/datum/gear/backpack/ringbox_diamond
name = "A diamond ring box"
path = /obj/item/storage/fancy/ringbox/diamond
/datum/gear/backpack/choice_beacon/box/carpet
name = "A carpet beacon"
path = /obj/item/choice_beacon/box/carpet
cost = 5

/datum/gear/backpack/necklace//this is here because loadout doesn't support proper accessories
name = "A renameable necklace"
path = /obj/item/clothing/accessory/necklace
/datum/gear/backpack/choice_beacon/pet
name = "A pet beacon"
path = /obj/item/choice_beacon/pet
cost = 7








37 changes: 25 additions & 12 deletions modular_lumos/code/modules/client/loadout/hands.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
name = "Cane"
path = /obj/item/cane

/datum/gear/hands/cigarettes
name = "Cigarette pack"
path = /obj/item/storage/fancy/cigarettes

/datum/gear/hands/dice
name = "Dice bag"
path = /obj/item/storage/dice
Expand All @@ -18,14 +14,6 @@
name = "Magic eightball"
path = /obj/item/toy/eightball

/datum/gear/hands/matches
name = "Matchbox"
path = /obj/item/storage/box/matches

/datum/gear/hands/cheaplighter
name = "Cheap lighter"
path = /obj/item/lighter/greyscale

/datum/gear/hands/cards
name = "Playing cards"
path = /obj/item/toy/cards/deck
Expand All @@ -43,11 +31,31 @@
path = /obj/item/reagent_containers/food/drinks/flask
cost = 2

/datum/gear/hands/matches
name = "Matchbox"
path = /obj/item/storage/box/matches

/datum/gear/hands/cheaplighter
name = "Cheap lighter"
path = /obj/item/lighter/greyscale

/datum/gear/hands/zippolighter
name = "Zippo Lighter"
path = /obj/item/lighter
cost = 2

/datum/gear/hands/cigpack_robust
name = "Robust packet"
path = /obj/item/storage/fancy/cigarettes/cigpack_robust

/datum/gear/hands/dromedaryco
name = "DromedaryCo packet"
path = /obj/item/storage/fancy/cigarettes/dromedaryco

/datum/gear/hands/cigpack_uplift
name = "Uplift Smooth packet"
path = /obj/item/storage/fancy/cigarettes/cigpack_uplift

/datum/gear/hands/cigar
name = "Cigar"
path = /obj/item/clothing/mask/cigarette/cigar
Expand All @@ -71,3 +79,8 @@
description = "Everything the electric razor does plus getting executed by security for slitting someone's throat with this."
path = /obj/item/razor/straightrazor
cost = 8

/datum/gear/hands/skateboard
name = "Skateboard"
path = /obj/item/melee/skateboard
cost = 10
5 changes: 0 additions & 5 deletions modular_lumos/code/modules/vending/wardrobes.dm
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion tgstation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4189,6 +4189,5 @@
#include "modular_lumos\code\modules\vectorcrafts\vectorvariants.dm"
#include "modular_lumos\code\modules\vending\autodrobe.dm"
#include "modular_lumos\code\modules\vending\clothesmate.dm"
#include "modular_lumos\code\modules\vending\wardrobes.dm"
#include "tools\Redirector\textprocs.dm"
// END_INCLUDE