Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 21 additions & 0 deletions code/modules/client/preference_setup/loadout/items/general.dm
Original file line number Diff line number Diff line change
Expand Up @@ -497,3 +497,24 @@
description = "A pack of red candles."
cost = 1
path = /obj/item/storage/box/fancy/candle_box

/datum/gear/mre
display_name = "mre selection"
description = "A selection of different MREs."
cost = 2
path = /obj/item/storage/box/fancy/mre

/datum/gear/mre/New()
..()
var/list/mres = list()
mres["meat pizza"] = /obj/item/storage/box/fancy/mre
mres["margherita pizza"] = /obj/item/storage/box/fancy/mre/menu2
mres["vegetable pizza"] = /obj/item/storage/box/fancy/mre/menu3
mres["hamburger"] = /obj/item/storage/box/fancy/mre/menu4
mres["taco"] = /obj/item/storage/box/fancy/mre/menu5
mres["meatbread"] = /obj/item/storage/box/fancy/mre/menu6
mres["salad"] = /obj/item/storage/box/fancy/mre/menu7
mres["hot chili"] = /obj/item/storage/box/fancy/mre/menu8
mres["boiled rice"] = /obj/item/storage/box/fancy/mre/menu9
mres["protein"] = /obj/item/storage/box/fancy/mre/menu10
gear_tweaks += new /datum/gear_tweak/path(mres)
Original file line number Diff line number Diff line change
Expand Up @@ -791,3 +791,22 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara)
colorable_cloaks["royal cloak (hooded)"] = /obj/item/clothing/suit/storage/hooded/tajaran/colorable/royal
colorable_cloaks["amohda cloak"] = /obj/item/clothing/suit/storage/hooded/tajaran/colorable/amohda
gear_tweaks += new /datum/gear_tweak/path(colorable_cloaks)

/datum/gear/taj_rations
display_name = "tajaran field ration selection"
description = "A selection of tajaran field ration boxes."
cost = 2
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
sort_category = "Xenowear - Tajara"
path = /obj/item/storage/field_ration

/datum/gear/taj_rations/New()
..()
var/list/tajrations = list()
tajrations["pra worker's meal"] = /obj/item/storage/field_ration/army
tajrations["pra nt sponsored"] = /obj/item/storage/field_ration/nanotrasen
tajrations["nka imperial army"] = /obj/item/storage/field_ration/nka/army
tajrations["nka royal navy"] = /obj/item/storage/field_ration/nka/navy
tajrations["dpra"] = /obj/item/storage/field_ration/dpra
gear_tweaks += new /datum/gear_tweak/path(tajrations)
58 changes: 58 additions & 0 deletions html/changelogs/Greenjoe - mreloadout.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################

# Your name.
author: Greenjoe

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Adds MREs to the general loadout, and Tajaran field ration boxes to the Tajaran loadout."
Loading