Merge branch 'master' of github.com:tgstation/tgstation into upstream-2026-06-23

This commit is contained in:
Roxy
2026-06-23 15:51:55 -04:00
1007 changed files with 40287 additions and 33507 deletions
@@ -593,3 +593,15 @@
name = "robusta beans"
desc = "A bag containing fresh, dry coffee robusta beans. Ethically sourced and packaged by Waffle Corp."
beantype = /obj/item/food/grown/coffee/robusta
/obj/item/storage/box/ramen_beef
name = "beef space ramen"
desc = "A box containing a brick of dehydrated ramen and a beef flavour sachet."
icon_state = "ramen_box"
illustration = null
storage_type = /datum/storage/box/ramen_beef
w_class = WEIGHT_CLASS_SMALL //it's meant to come in packs of five and the box can only hold two items, beef flavour or dry ramen
/obj/item/storage/box/ramen_beef/PopulateContents()
new /obj/item/reagent_containers/condiment/pack/beef_flavour(src)
new /obj/item/food/spaghetti/ramen_dry(src)
@@ -764,6 +764,8 @@
new /obj/item/book/manual/nuclear(src) // Very important
// The most important part of the kit, the implant that gives them the syndicate faction.
new /obj/item/implanter/induction_implant(src)
// Tactical map implant so they can see the minimap with the rest of the team.
new /obj/item/implanter/tacmap/nuclear(src)
// All in all, 6+3+3+2+5+2+4 = ~25 TC of 'miscellaneous' items.
// This is a lot of value for 10 TC, but you have to keep in mind that you NEED someone to get this stuff station-side.
// Pretty much all of it is a bad deal for reinforcements or yourself as they already have similar or good-enough alternatives.