Skip to content

Commit

Permalink
Merge pull request #3242 from cebutris/naomi
Browse files Browse the repository at this point in the history
adds in naomi reids
  • Loading branch information
Tk420634 authored Oct 2, 2023
2 parents 11acc1d + dd8aab8 commit 9159f10
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
3 changes: 2 additions & 1 deletion code/game/objects/items/storage/belt.dm
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,7 @@
/// snackdolier
/obj/item/storage/belt/military/snack
name = "tactical snack rig"
desc = "Snackrolling the Mojavelicious fillmost caramakel you satiswish for a nuclear whunger"

/obj/item/storage/belt/military/snack/Initialize()
. = ..()
Expand Down Expand Up @@ -850,6 +851,6 @@

/obj/item/storage/belt/military/french_webbing
name = "french webbing"
desc = "A versatile chest rig, this one seems to be used in long bread enviroments and such"
desc = "A versailles chest rig, this one seems to be used in long bread enviroments and such"
icon_state = "french_webbing"
item_state = "french_webbing"
20 changes: 20 additions & 0 deletions modular_citadel/code/modules/client/loadout/uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,26 @@
path = /obj/item/clothing/under/suit/turtle/grey
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SWEATERS

/datum/gear/uniform/sweater
name = "cream sweater"
path = /obj/item/clothing/under/sweater
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SWEATERS
/datum/gear/uniform/sweater/black
name = "black sweater"
path = /obj/item/clothing/under/sweater/black
/datum/gear/uniform/sweater/blue
name = "blue sweater"
path = /obj/item/clothing/under/sweater/blue
/datum/gear/uniform/sweater/purple
name = "purple sweater"
path = /obj/item/clothing/under/sweater/purple
/datum/gear/uniform/sweater/green
name = "green sweater"
path = /obj/item/clothing/under/sweater/green
/datum/gear/uniform/sweater/red
name = "red sweater"
path = /obj/item/clothing/under/sweater/red

/datum/gear/uniform/skirt/blueschool
name = "blue schoolgirl uniform"
path = /obj/item/clothing/under/costume/schoolgirl
Expand Down

0 comments on commit 9159f10

Please sign in to comment.