Skip to content

Commit

Permalink
Merge pull request #11 from Tk420634/loadout
Browse files Browse the repository at this point in the history
The loadoutening
  • Loading branch information
Tk420634 committed Jun 24, 2024
2 parents 19c40b1 + 93588bc commit fa5e0ad
Show file tree
Hide file tree
Showing 8 changed files with 202 additions and 6,460 deletions.
712 changes: 4 additions & 708 deletions modular_citadel/code/modules/client/loadout/backpack.dm

Large diffs are not rendered by default.

99 changes: 0 additions & 99 deletions modular_citadel/code/modules/client/loadout/belt_loadout.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,109 +3,10 @@
slot = SLOT_BELT //doublecheck to make sure is right
cost = 2 //at this point, cost pretty much just justifies the existence of crafting instead

/datum/gear/belt/fannypack //remove from other spot
name = "brown fannypack"
path = /obj/item/storage/belt/fannypack

/datum/gear/belt/fannypack/black
name = "black fannypack"
path = /obj/item/storage/belt/fannypack/black

/datum/gear/belt/fannypack/orange
name = "orange fannypack"
path = /obj/item/storage/belt/fannypack/orange

/datum/gear/belt/fannypack/pink
name = "pink fannypack"
path = /obj/item/storage/belt/fannypack/pink

/datum/gear/belt/utility
name = "toolbelt"
path = /obj/item/storage/belt/utility

/datum/gear/belt/explorer
name = "explorer's webbing"
path = /obj/item/storage/belt/utility/mining

/datum/gear/belt/utility/gardener
name = "gardener's toolbelt"
path = /obj/item/storage/belt/utility/gardener

/datum/gear/belt/utility/mining/primitive
name = "hunter's belt"
path = /obj/item/storage/belt/utility/mining/primitive

/datum/gear/belt/janitor
name = "janibelt"
path = /obj/item/storage/belt/janitor

/datum/gear/belt/medical
name = "medical belt"
path = /obj/item/storage/belt/medical

/datum/gear/belt/military
name = "chest rig"
path = /obj/item/storage/belt/military

/datum/gear/belt/military/alt
name = "webbing"
path = /obj/item/storage/belt/military/alt

/datum/gear/belt/military/snack
name = "tactical snack rig" //hi dan~
path = /obj/item/storage/belt/military/snack
cost = 4 //it comes full with 22 snacks inside, literally overflowing

/datum/gear/belt/military/plush
name = "tactical plushie rig"
path = /obj/item/storage/belt/military/plush
cost = 4 //so. many. plushies.

/datum/gear/belt/army
name = "army belt"
path = /obj/item/storage/belt/army

/datum/gear/belt/armyold
name = "old style army belt"
path = /obj/item/storage/belt/army/assault/enclave
cost = 2

/datum/gear/belt/army/assault
name = "assault belt"
path = /obj/item/storage/belt/army/assault

/datum/gear/belt/grenade
name = "grenadier belt"
path = /obj/item/storage/belt/grenade

/datum/gear/belt/legholster
name = "hip holster"
path = /obj/item/storage/belt/legholster

/datum/gear/belt/legholster/throwing
name = "garter rig"
path = /obj/item/storage/belt/legholster/throwing

/datum/gear/belt/sword/twin
name = "twin sheath" //for hemidicks
path = /obj/item/storage/belt/sword/twin

/datum/gear/belt/sabre/heavy
name = "heavy-duty sheath" //for the heaviest dicks
path = /obj/item/storage/belt/sabre/heavy

/datum/gear/belt/webbing/burma
name = "Pattern 37 webbing"
path = /obj/item/storage/belt/military/commonwealth_brit

/datum/gear/belt/webbing/burma/oldschoolonceagain
name = "1908 pattern webbing"
path = /obj/item/storage/belt/military/commonwealth_brit/oldschool

/datum/gear/belt/leather/boer
name = "Boer War leather bandolier"
path = /obj/item/storage/belt/bandolier/boer_band

/datum/gear/belt/webbing/french
name = "french webbing"
path = /obj/item/storage/belt/military/french_webbing
82 changes: 0 additions & 82 deletions modular_citadel/code/modules/client/loadout/glasses.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,96 +11,14 @@
name = "Fake Blindfold"
path = /obj/item/clothing/glasses/fakeblindfold

/datum/gear/glasses/sunglasses
name = "Sunglasses"
path = /obj/item/clothing/glasses/sunglasses

/datum/gear/glasses/eyepatch/syndicate // the special effects were commented out by someone else, so this is just cosmetic now.
name = "cybernetic eyepatch"
path = /obj/item/clothing/glasses/eyepatch/syndicate

/datum/gear/glasses/sunglasses/big
name = "Large sunglasses"
path = /obj/item/clothing/glasses/sunglasses/big

/datum/gear/glasses/chameleon
name = "chameleon glasses"
path = /obj/item/clothing/glasses/chameleon
cost = 0

/datum/gear/glasses/biker
name = "biker goggles"
path = /obj/item/clothing/glasses/f13/biker
cost = 1

/datum/gear/glasses/sandstorm
name = "sandstorm goggles"
path = /obj/item/clothing/glasses/legiongoggles

/datum/gear/glasses/geist_gazers
name = "Geist Gazers Glasses"
path = /obj/item/clothing/glasses/geist_gazers

// /datum/gear/glasses/psychglasses
// name = "Psych Glasses"
// path = /obj/item/clothing/glasses/psych

/datum/gear/glasses/eyepatch
name = "Eyepatch"
path = /obj/item/clothing/glasses/eyepatch


/datum/gear/glasses/eyepatchl
name = "White Eye Bandage - Left"
path = /obj/item/clothing/glasses/eyepatchl

/datum/gear/glasses/eyepatchr
name = "White Eye Bandage - Right"
path = /obj/item/clothing/glasses/eyepatchr

/datum/gear/glasses/hipster
name = "Hipster glasses"
path = /obj/item/clothing/glasses/regular/hipster

/datum/gear/glasses/jamjar
name = "Jamjar glasses"
path = /obj/item/clothing/glasses/regular/jamjar

/datum/gear/glasses/circle
name = "Circle glasses"
path = /obj/item/clothing/glasses/regular/circle

/datum/gear/glasses/monocle
name = "Monocle"
path = /obj/item/clothing/glasses/monocle

/datum/gear/glasses/orange
name = "Orange glasses"
path = /obj/item/clothing/glasses/orange

/datum/gear/glasses/red
name = "Red Glasses"
path = /obj/item/clothing/glasses/red

/* You have em or ya' don't, welcome to the post apocalypse. ~TK
/datum/gear/glasses/prescription
name = "Prescription glasses"
path = /obj/item/clothing/glasses/regular
*/

/datum/gear/glasses/cold
name = "cold-resistant goggles"
path = /obj/item/clothing/glasses/cold

/datum/gear/glasses/heat
name = "heat-resistant goggles"
path = /obj/item/clothing/glasses/heat

/datum/gear/glasses/biker
name = "biker goggles"
path = /obj/item/clothing/glasses/f13/biker

/datum/gear/glasses/contact
name = "contact lenses"
path = /obj/item/clothing/glasses/contact
cost = 3
Loading

0 comments on commit fa5e0ad

Please sign in to comment.