diff --git a/GainStation13/code/game/lore_papers.dm b/GainStation13/code/game/lore_papers.dm new file mode 100644 index 00000000..4130429e --- /dev/null +++ b/GainStation13/code/game/lore_papers.dm @@ -0,0 +1,55 @@ +//////// feeder den, GS13 + +/obj/item/paper/fluff/ruins/feeder_den/hidden + name = "hastily scribbled note" + info = "It took so long for me to make this hideout, but it might all be in vain. In the short breaks when I'm not observed, I'm trying to fix this radio I managed to sneak by... but judging by how I can barely squeeze my ass past this stupid hole less and less each day, I might not fix it in time..." + +/obj/item/paper/fluff/ruins/feeder_den/report1 + name = "Captive report No 1" + info = "We've managed to obtain two captives - one woman, and one lizard. They seem promising so far... already quite chunky and eager to scarf down whatever we give them. It might be even easier to turn them into proper beds once we're past the chemical treatment." + +/obj/item/paper/fluff/ruins/feeder_den/report2 + name = "Captive report No 2" + info = "The woman seems to be showing great progress, we'll be moving her into the larger cell soon. The lizard guy is still a bit reluctant about eating himself into immobility... but no matter, we'll just double his portions. Perhaps a painfully overstuffed stomach will change his mind." + +/obj/item/paper/fluff/ruins/feeder_den/report3 + name = "Captive report No 3" + info = "We've captured another one! A curious space explorer, snooping around near our entrance. Fierce bastard, even managed to cut my arm open! A short treatment of a room full of lipoifier smoke ensured that they won't be able to fit back into their hardsuit." + +/obj/item/paper/fluff/ruins/feeder_den/report4 + name = "Captive report No 4" + info = "(the page seems to be full of food stains, making the writing unreadable.)" + +/obj/item/paper/fluff/ruins/feeder_den/augment_note + name = "READ ME!" + info = "Don't use this auto-surgeon on yourself, dumbass!" + +// calorite research facility + +/obj/item/paper/fluff/ruins/calorite_facility/note1 + name = "Research Department - Report #1" + info = "The facility appears to be ready for usage. We've already imported a couple willing subjects, currently waiting in their designated areas. The testing shall begin according to the schedule." + +/obj/item/paper/fluff/ruins/calorite_facility/note4 + name = "Research Department - Report #4" + info = "I'm aware of the fact that we're pioneers in this field of science, but this facility seems a little... oddly designed? In the next designs or iterations, instruct the architects to provide larger, more secluded labs. Why do we even need those three conveyor belts?" + +/obj/item/paper/fluff/ruins/calorite_facility/note18 + name = "Research Department - Report #18" + info = "The research is going excellently, though the miners have reported strange figures seemingly observing them within the mining shafts. I've suggested that it's just fauna, but they insist that it's unlike anything they've ever seen before... and yet they can never describe those things. Just to keep morale high, please send more security supplies." + +/obj/item/paper/fluff/ruins/calorite_facility/note37 + name = "Research Department - Report #37" + info = "I'm not sure who I'm writing this paper for. The connection with HQ has been severed days ago and since then, half of our personnel has gone missing. I swear someone's sabotaging this fucking place too... Until someone fixes the telecomms relay, I'll probably hide myself in the medbay. Seems like the safest place." + +/obj/item/paper/fluff/ruins/calorite_facility/security_note + name = "Scribbled note" + info = "Funny work so far, but admittedly pretty easy. I'm only supposed to not touch the orange junk and rally up some lardasses and-- let's be real, how much harm can someone like that do?" + +/obj/item/paper/fluff/ruins/calorite_facility/engineer_note + name = "Oil-stained note" + info = "Please tell those fucking deadbrained amoebas at HQ that a full facility needs a PROPER engine, not a bunch of fucking PACMANs. Even a damned SM shard would suffice..." + +/obj/item/paper/fluff/ruins/calorite_facility/charred + name = "Charred note" + info = "They've g-- -all, -- s--en. Cloak-d fig----, ---...(the rest of the note seems unreadable)" diff --git a/GainStation13/code/modules/research/designs/nutri_designs.dm b/GainStation13/code/modules/research/designs/nutri_designs.dm index df2124ca..2d78c4e8 100644 --- a/GainStation13/code/modules/research/designs/nutri_designs.dm +++ b/GainStation13/code/modules/research/designs/nutri_designs.dm @@ -22,10 +22,6 @@ category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SECURITY - -// FIX THOSE VALUES LATER!! - - /datum/design/calorite_collar name = "Calorite Collar" desc = "A collar that amplifies caloric intake of the wearer." @@ -34,6 +30,16 @@ materials = list(MAT_METAL = 1000, MAT_CALORITE = 4000) construction_time = 75 build_path = /obj/item/clothing/neck/petcollar/calorite - category = list("Equipment") // FIX THIS CATEGORY LATER, FORGOT THEIR NAMES LUL + category = list("Equipment", "Misc", "Medical Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE +/datum/design/cyberimp_nutriment_turbo + name = "Nutriment Pump Implant TURBO" + desc = "This implant with synthesize and pump into your bloodstream a small amount of nutriment when you are hungry." + id = "ci-nutrimentturbo" + build_type = PROTOLATHE | MECHFAB + construction_time = 100 + materials = list(MAT_METAL = 800, MAT_GLASS = 800, MAT_GOLD = 750, MAT_URANIUM = 1000) + build_path = /obj/item/organ/cyberimp/chest/nutriment/turbo + category = list("Misc", "Medical Designs") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL diff --git a/GainStation13/code/modules/research/techweb/nutritech_nodes.dm b/GainStation13/code/modules/research/techweb/nutritech_nodes.dm new file mode 100644 index 00000000..515e1a42 --- /dev/null +++ b/GainStation13/code/modules/research/techweb/nutritech_nodes.dm @@ -0,0 +1,23 @@ +/////////////// GS13 - NUTRITIONAL TECHNOLOGY + +/datum/techweb_node/nutri_tech + id = "nutritech_weapons" + display_name = "Nutri-Tech Weapons" + description = "Ending world hunger was never made easier!" + prereq_ids = list("biotech") // add "engineering" if the designs get complicated later on + design_ids = list("calorite_collar", "ci-nutrimentturbo") + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) + boost_item_paths = list(/obj/item/gun/energy/fatoray, /obj/item/gun/energy/fatoray/cannon, /obj/item/trash/fatoray_scrap1, /obj/item/trash/fatoray_scrap2) + export_price = 5000 + hidden = TRUE + +/datum/techweb_node/nutri_tools + id = "nutritech_tools" + display_name = "Nutri-Tech Tools" + description = "Ever wanted to reach your daily caloric intake in just 5 seconds?" + prereq_ids = list("biotech", "adv_engi") + design_ids = list("fatoray_weak", "fatoray_cannon_weak") + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) + boost_item_paths = list(/obj/item/gun/energy/fatoray, /obj/item/gun/energy/fatoray/cannon, /obj/item/trash/fatoray_scrap1, /obj/item/trash/fatoray_scrap2) + export_price = 10000 + hidden = TRUE diff --git a/GainStation13/code/modules/surgery/organs/augments.dm b/GainStation13/code/modules/surgery/organs/augments.dm new file mode 100644 index 00000000..5fee50d4 --- /dev/null +++ b/GainStation13/code/modules/surgery/organs/augments.dm @@ -0,0 +1,11 @@ +//GS13 - implants and similar + +/obj/item/organ/cyberimp/chest/nutriment/turbo + name = "Nutriment pump implant TURBO" + desc = "This implant was meant to prevent people from going hungry, but due to a flaw in its designs, it permanently produces a small amount of nutriment overtime." + icon_state = "chest_implant" + implant_color = "#006607" + nutrition_amount = 20 //somewhere around 5 pounds + hunger_threshold = NUTRITION_LEVEL_FULL + poison_amount = 10 + message = "" //no message cuz spam is annoying diff --git a/GainStation13/code/obj/items/minor_items.dm b/GainStation13/code/obj/items/minor_items.dm index 47c98280..2987f211 100644 --- a/GainStation13/code/obj/items/minor_items.dm +++ b/GainStation13/code/obj/items/minor_items.dm @@ -58,3 +58,10 @@ name = "chewed gum" icon = 'GainStation13/icons/obj/gum.dmi' icon_state = "gum_chewed" + +// nutriment pump turbo + +/obj/item/autosurgeon/nutripump_turbo + desc = "A single use autosurgeon that contains a turbo version of nutriment pump of. A screwdriver can be used to remove it, but implants can't be placed back in." + uses = 1 + starting_organ = /obj/item/organ/cyberimp/chest/nutriment/turbo diff --git a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm index 1ef56b6e..6e9a36e2 100644 --- a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm +++ b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm @@ -2,14 +2,14 @@ "aE" = (/obj/structure/rack/shelf,/obj/item/storage/box/donkpockets/donkpockethonk,/obj/item/storage/box/donkpockets/donkpocketpizza{pixel_y = 4},/obj/item/storage/box/donkpockets/donkpocketspicy{pixel_y = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "aM" = (/obj/structure/sign/poster/contraband/corn_oil{pixel_y = 32},/obj/structure/reagent_dispensers/keg/mead,/obj/machinery/light{dir = 1},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "aQ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal{dir = 4},/obj/machinery/door/airlock/hatch{name = "airlock"; req_access_txt = "150"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) -"ba" = (/obj/structure/rack/shelf,/obj/item/storage/fancy/donut_box{pixel_y = -4},/obj/item/storage/fancy/donut_box,/obj/item/storage/fancy/donut_box{pixel_y = 4},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"ba" = (/obj/structure/rack/shelf,/obj/item/storage/fancy/donut_box{pixel_y = -4},/obj/item/storage/fancy/donut_box,/obj/item/storage/fancy/donut_box{pixel_y = 4},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown,/obj/item/autosurgeon/nutripump_turbo,/obj/item/autosurgeon/nutripump_turbo,/obj/item/paper/fluff/ruins/feeder_den/augment_note,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "bo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "bx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/public/glass{name = "Cell 4"; id_tag = "feederden_cell4"},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) "bU" = (/obj/structure/chair/sofa/left,/obj/machinery/button/door{name = "Window Shutters North"; id = "feederden_north"; pixel_y = 25},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "bW" = (/obj/structure/closet/secure_closet/freezer/meat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/meat/rawbacon,/obj/item/reagent_containers/food/snacks/meat/rawbacon,/obj/item/reagent_containers/food/snacks/meat/rawbacon,/obj/item/reagent_containers/food/snacks/meat/slab/bear,/obj/item/reagent_containers/food/snacks/meat/slab/bear,/obj/item/reagent_containers/food/snacks/meat/slab/bear,/obj/structure/window/reinforced/tinted{dir = 8},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden) "bX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/machinery/meter,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "cd" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/disposalpipe/segment,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) -"cn" = (/obj/structure/table,/obj/item/organ/cyberimp/chest/nutriment/plus{pixel_y = 12; pixel_x = 9},/obj/item/organ/cyberimp/chest/nutriment{pixel_x = -5; pixel_y = 13},/obj/item/gun/ballistic/automatic/pistol/suppressed{pixel_x = -14; pixel_y = 7},/obj/machinery/recharger,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/structure/medkit_cabinet{pixel_y = 27},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"cn" = (/obj/structure/table,/obj/item/gun/ballistic/automatic/pistol/suppressed{pixel_x = -14; pixel_y = 7},/obj/machinery/recharger,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/structure/medkit_cabinet{pixel_y = 27},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "cw" = (/obj/structure/rack,/obj/item/clothing/suit/space/syndicate{pixel_x = -10},/obj/item/clothing/head/helmet/space/syndicate{pixel_x = -10},/obj/item/clothing/mask/gas{pixel_x = -10; pixel_y = 3},/obj/item/clothing/suit/space/syndicate/orange{pixel_x = 8; name = "extra stretchy space suit"},/obj/item/clothing/head/helmet/space/syndicate/orange{pixel_x = 10},/obj/item/clothing/mask/gas{pixel_x = 10; pixel_y = 3},/obj/item/tank/jetpack/carbondioxide/eva,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "cx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/structure/cable{icon_state = "2-8"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "cy" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/snacks/store/cake/chocolate,/obj/machinery/light/small{dir = 1},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) @@ -171,6 +171,7 @@ "Eq" = (/obj/machinery/shower{dir = 8},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden) "Es" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/feedersden) "Ex" = (/obj/item/trash/boritos,/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) +"EW" = (/obj/machinery/porta_turret/fattening,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "Ff" = (/obj/structure/sign/poster/contraband/eat{pixel_y = 32},/turf/open/floor/carpet/black,/area/ruin/space/has_grav/feedersden) "Fm" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/item/storage/toolbox/syndicate,/obj/effect/turf_decal/box/red,/obj/machinery/power/port_gen/pacman/super,/obj/structure/cable,/obj/structure/cable{icon_state = "1-8"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "FD" = (/obj/machinery/vending/dinnerware{free = 1},/obj/machinery/light{dir = 1},/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) @@ -230,6 +231,7 @@ "Ss" = (/obj/machinery/smartfridge/food,/obj/item/reagent_containers/food/snacks/taco,/obj/item/reagent_containers/food/snacks/sushie_pro,/obj/item/reagent_containers/food/snacks/pastatomato,/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "Sy" = (/obj/machinery/deepfryer,/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "Tl" = (/obj/structure/sign/poster/contraband/space_cola{pixel_x = 32},/obj/structure/scale,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) +"Tx" = (/obj/item/reagent_containers/glass/beaker/lipoifier{name = "lipoifier beaker"; pixel_x = -16; pixel_y = -5},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden) "TG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "TH" = (/obj/item/reagent_containers/food/snacks/chocolatebar,/obj/item/trash/candy{pixel_x = 10; pixel_y = -3},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "TK" = (/obj/decal/stencil/left/one,/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/feedersden) @@ -245,6 +247,7 @@ "Wt" = (/obj/structure/table,/obj/item/storage/box/donkpockets/donkpocketteriyaki,/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "WN" = (/obj/structure/rack/shelf,/obj/item/reagent_containers/food/snacks/syndicake,/obj/item/reagent_containers/food/snacks/syndicake,/obj/item/reagent_containers/food/snacks/chips,/obj/item/reagent_containers/food/snacks/chips,/obj/item/reagent_containers/food/snacks/cornchips,/obj/item/reagent_containers/food/snacks/cornchips,/obj/item/reagent_containers/food/snacks/candy,/obj/item/reagent_containers/food/snacks/candy,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "Xh" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) +"XL" = (/turf/closed/mineral/random,/area/ruin/space/has_grav/feedersden) "XW" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/light,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "Yp" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 8},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "YA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/tile/red,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) @@ -278,14 +281,14 @@ FEFEFEFEFEfmfmBrBrBrDcDcNJNJDcnrnrnrnrnrnrnrnrnrnrDxvYNxgUSsgUuXvYvYnrnrnrgqnrnr FEFEFEFEBrZCfmISBrBrBrnrMaEqnrxGNgHpnrWNYEfncnbanrDxvYFDLNvYsRiNvYsanrrJZOWrkoPgnrridlkCnrfNginrBrBrBrFEFEFEFE FEFEFEFEBrBrfmfmBrBrBrnrtyEqnrikJhJhWsDOlslslslsvtDxvYSyIqvYrjtIvYmUnrcWmaICrscxtVbXJhJhnrfNdAnrBrBrBrFEFEFEFE FEFEFEFEFEBrwwfmeEBrBrDcnrnrnrnrxGHpNksNtHguboygaQoYvYvYvYvYvYvwvYkdnrxCTYFHYpDBnrzlkMDcnrnrnrDcBrBrBrFEFEFEFE -FEFEFEFEFEBrxZfmfmBrBrBrBrBrBrDcnrnrDcqtlsucaEBPnrvYDKMYMdRhWtjhANYUnrnrnrTPJhYXnrnrnrDcBrBrfmYNBrBrBrBrFEFEFE +FEFEFEFEFEBrxZfmfmBrBrBrBrBrBrDcnrnrDcqtlsucaEBPnrvYDKMYMdRhWtjhANYUnrnrnrTPJhYXnrnrnrDcBrBrEWYNBrBrBrBrFEFEFE FEFEFEFEFEFEfmfmBrBrBrBrBrBrBrBrBrBrnrqhlslslsVFDczAnrnrnrkgnrnrnrnrDcAgcwddRCuFnrBrBrBrBrBrVefmxZqFBrBrFEFEFE FEFEFEFEFEFEFEfmBrBrBrBrBrBrBrBrBrBrnrcVlslslsdzPItjfhnroHoHoHdrJhnwAalslsfKJhvHnrBrBrBrBrBrfmFEFEebFEFEFEFEFE -FEFEFEFEFEFEFEFEBrBrBrBrBrBrBrBrBrBrnrqMyqzJjSTUbWtjsunrMqoHoHdrJhJhAalslscdzoFmEsieieieieRwfmFEFEebFEFEFEFEFE +FEFEFEFEFEFEFEFEBrBrBrBrBrBrBrBrBrBrnrqMyqzJjSTUbWTxsunrMqoHoHdrJhJhAalslscdzoFmEsieieieieRwfmFEFEebFEFEFEFEFE FEFEFEFEFEFEFEFEFEBrBrBrBrBrBrBrBrBrnrnrnrnrnrnrnrnrnrDcoHoHoHDcnrnrnrnrnrzEvLvLMiRuRuRuRuUZFEFEFEebFEFEFEFEFE -FEFEFEFEFEFEFEFEFEFEBrBrBrBrBrFEFEBrBrBrBrBrBrBrBrBrqFebebebebebqFBrBrBrBrBrBrBrBrBrBrBrBrqFebebqFqFFEFEFEFEFE -FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEBrBrBrBrBrBrBrFEFEFEFEFEFExZfmISfmeEfmBrBrBrBrBrBrBrFEFEFEBrBrFEFEFEFEFE -FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEBrBrBrBrFEFEFEFEFEFEfmfmfmfmfmfmISBrBrBrBrBrBrFEFEFEFEFEFEFEFEFEFE +FEFEFEFEFEFEFEFEFEFEBrBrBrBrBrFEFEBrBrBrBrBrBrBrXLBrqFebebebebebqFXLBrBrBrBrBrBrBrBrBrBrBrqFebebqFqFFEFEFEFEFE +FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEBrBrBrBrBrEWfmFEFEFEFEFEFExZEWISfmeEfmBrBrBrBrBrBrBrFEFEFEBrBrFEFEFEFEFE +FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEBrBrfmfmFEFEFEFEFEFEfmfmfmfmfmfmISBrBrBrBrBrBrFEFEFEFEFEFEFEFEFEFE FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEBrBrFEFEFEFEFEFEFEBrfmfmwwxZfmfmfmBrBrqFqFFEFEFEFEFEFEFEFEFEFEFE FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEBrBrVefmfmfmfmfmfmFEebebFEFEFEFEFEFEFEFEFEFEFE FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEBrBrBrBrZCZCfmFEFEFEebebFEFEFEFEFEFEFEFEFEFEFE diff --git a/_maps/map_files/Mining/Lavaland_Lower.dmm b/_maps/map_files/Mining/Lavaland_Lower.dmm index 948e5244..9dcb0cab 100644 --- a/_maps/map_files/Mining/Lavaland_Lower.dmm +++ b/_maps/map_files/Mining/Lavaland_Lower.dmm @@ -6708,6 +6708,9 @@ /obj/machinery/door/airlock/public, /turf/open/floor/plasteel/dark, /area/xenoarch/caloriteresearch_powered) +"rh" = ( +/turf/open/floor/plating/lavaland_baseturf, +/area/lavaland/surface/outdoors) "ri" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -6751,6 +6754,16 @@ }, /turf/open/floor/engine, /area/xenoarch/caloriteresearch_powered) +"ry" = ( +/obj/item/bodypart/l_leg{ + pixel_y = 8; + pixel_x = -5 + }, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/xenoarch/caloriteresearch_powered) "rB" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -6865,6 +6878,8 @@ "sx" = ( /obj/structure/fluff/paper, /obj/structure/filingcabinet, +/obj/item/paper/fluff/ruins/calorite_facility/note1, +/obj/item/paper/fluff/ruins/calorite_facility/note18, /turf/open/floor/plasteel/dark, /area/xenoarch/caloriteresearch_powered) "sy" = ( @@ -6929,6 +6944,17 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/dark, /area/xenoarch/gen) +"tc" = ( +/obj/structure/window/reinforced/tinted{ + dir = 4 + }, +/obj/machinery/conveyor{ + dir = 2; + id = "fatchamber" + }, +/obj/item/projectile/energy/fattening/cannon, +/turf/open/floor/plating, +/area/xenoarch/caloriteresearch_powered) "ti" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -7100,9 +7126,7 @@ /obj/effect/turf_decal/stripes{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" - }, +/obj/structure/cable, /turf/open/floor/plating, /area/xenoarch/caloriteresearch_powered) "uv" = ( @@ -7129,6 +7153,10 @@ }, /turf/open/floor/plasteel/dark, /area/xenoarch/caloriteresearch_powered) +"uG" = ( +/obj/item/projectile/energy/fattening/cannon, +/turf/open/floor/mineral/calorite, +/area/xenoarch/caloriteresearch_powered) "uH" = ( /obj/structure/table, /obj/item/multitool, @@ -7265,6 +7293,12 @@ }, /turf/open/floor/plasteel, /area/xenoarch/caloriteresearch_powered) +"vU" = ( +/obj/structure/cable, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/xenoarch/caloriteresearch_powered) "vX" = ( /obj/machinery/light{ dir = 1 @@ -7375,6 +7409,7 @@ /obj/machinery/light/small/broken{ dir = 1 }, +/obj/item/autosurgeon/nutripump_turbo, /turf/open/floor/plasteel/dark, /area/xenoarch/caloriteresearch_powered) "wR" = ( @@ -8019,6 +8054,7 @@ "Bl" = ( /obj/structure/filingcabinet, /obj/structure/fluff/paper, +/obj/item/paper/fluff/ruins/calorite_facility/note4, /turf/open/floor/plasteel/dark, /area/xenoarch/caloriteresearch_powered) "Bm" = ( @@ -8112,6 +8148,10 @@ /obj/structure/girder, /turf/open/floor/plating/lavaland_baseturf, /area/xenoarch/caloriteresearch_powered) +"BY" = ( +/obj/structure/mineral_door/calorite, +/turf/open/floor/plating, +/area/xenoarch/caloriteresearch_powered) "Cc" = ( /obj/effect/turf_decal/loading_area, /obj/effect/turf_decal/stripes/line{ @@ -9064,6 +9104,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/item/paper/fluff/ruins/calorite_facility/engineer_note, /turf/open/floor/plating, /area/xenoarch/caloriteresearch_powered) "Jy" = ( @@ -9151,8 +9192,10 @@ dir = 5 }, /area/xenoarch/gen) +"Kf" = ( +/turf/open/floor/mineral/basaltstone_floor, +/area/xenoarch/caloriteresearch_powered) "Kh" = ( -/obj/structure/cable, /obj/effect/turf_decal/box/white, /turf/open/floor/plating, /area/xenoarch/caloriteresearch_powered) @@ -9351,6 +9394,10 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass, /area/xenoarch/caloriteresearch_powered) +"LM" = ( +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/plating, +/area/xenoarch/caloriteresearch_powered) "LN" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -9494,6 +9541,10 @@ }, /turf/open/floor/plating, /area/xenoarch/caloriteresearch_powered) +"MF" = ( +/obj/machinery/porta_turret/fattening, +/turf/open/floor/plasteel, +/area/xenoarch/caloriteresearch_unpowered) "MH" = ( /obj/structure/tank_dispenser, /obj/machinery/light/small{ @@ -9556,6 +9607,10 @@ icon_state = "engine" }, /area/xenoarch/nothinghere) +"Ng" = ( +/obj/item/paper/fluff/ruins/calorite_facility/charred, +/turf/open/floor/plasteel, +/area/xenoarch/caloriteresearch_powered) "Nh" = ( /obj/structure/table, /obj/item/plant_analyzer, @@ -9650,6 +9705,10 @@ }, /turf/open/floor/plasteel, /area/xenoarch/caloriteresearch_powered) +"NX" = ( +/obj/structure/mineral_door/calorite, +/turf/open/floor/mineral/calorite, +/area/xenoarch/caloriteresearch_powered) "NZ" = ( /obj/structure/rack, /obj/item/pickaxe, @@ -9888,6 +9947,7 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/item/clothing/accessory/armband/science, /turf/open/floor/carpet/royalblue, /area/xenoarch/caloriteresearch_powered) "Pv" = ( @@ -9906,6 +9966,11 @@ }, /turf/open/floor/plasteel, /area/xenoarch/caloriteresearch_powered) +"PC" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/accessory/armband/medblue, +/turf/open/floor/wood, +/area/xenoarch/caloriteresearch_powered) "PF" = ( /obj/structure/table, /obj/item/trash/tray, @@ -10121,6 +10186,12 @@ /obj/machinery/mineral/processing_unit_console, /turf/closed/wall, /area/xenoarch/caloriteresearch_powered) +"RK" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/under/rank/chief_engineer, +/obj/item/clothing/shoes/workboots/toeless, +/turf/open/floor/wood, +/area/xenoarch/caloriteresearch_powered) "RL" = ( /obj/structure/closet/crate{ icon_state = "crateopen" @@ -10240,6 +10311,10 @@ /obj/effect/turf_decal/box, /turf/open/floor/plasteel, /area/xenoarch/caloriteresearch_powered) +"Ss" = ( +/obj/machinery/porta_turret/fattening, +/turf/open/floor/plating/lavaland_baseturf, +/area/lavaland/surface/outdoors) "St" = ( /obj/machinery/light/broken{ dir = 1 @@ -10318,6 +10393,11 @@ /obj/item/xenoarch/clean/brush, /turf/open/floor/plasteel, /area/xenoarch/caloriteresearch_powered) +"SP" = ( +/obj/structure/table, +/obj/item/paper/fluff/ruins/calorite_facility/note37, +/turf/open/floor/plasteel/dark, +/area/xenoarch/caloriteresearch_powered) "SR" = ( /obj/machinery/door/airlock/public/glass{ dir = 4 @@ -10349,6 +10429,10 @@ "Te" = ( /obj/structure/table/wood, /obj/item/trash/candle, +/obj/item/paper/fluff/ruins/calorite_facility/security_note{ + pixel_y = -7; + pixel_x = 9 + }, /turf/open/floor/wood, /area/xenoarch/caloriteresearch_powered) "Tg" = ( @@ -10375,7 +10459,9 @@ /turf/open/floor/plating/lavaland_baseturf, /area/xenoarch/caloriteresearch_unpowered) "Tn" = ( -/obj/structure/closet/secure_closet/personal/cabinet, +/obj/structure/closet/cabinet, +/obj/item/clothing/under/plasmaman/science, +/obj/item/clothing/head/helmet/space/plasmaman/science, /turf/open/floor/carpet/royalblue, /area/xenoarch/caloriteresearch_powered) "To" = ( @@ -10604,7 +10690,7 @@ /turf/open/floor/plasteel/freezer, /area/xenoarch/caloriteresearch_powered) "UL" = ( -/obj/structure/closet/secure_closet/personal/cabinet, +/obj/structure/closet/cabinet, /turf/open/floor/wood, /area/xenoarch/caloriteresearch_powered) "UM" = ( @@ -10612,6 +10698,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/xenoarch/caloriteresearch_powered) +"UN" = ( +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/obj/machinery/conveyor{ + dir = 1; + id = "fatchamber" + }, +/obj/item/projectile/energy/fattening/cannon, +/turf/open/floor/plating, +/area/xenoarch/caloriteresearch_powered) "UO" = ( /turf/closed/wall/r_wall, /area/lavaland/surface/outdoors) @@ -11000,13 +11097,13 @@ /turf/open/floor/plasteel, /area/xenoarch/caloriteresearch_powered) "XY" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/item/storage/toolbox/mechanical{ pixel_x = 4; pixel_y = 9 }, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/plating, /area/xenoarch/caloriteresearch_powered) "XZ" = ( @@ -11063,6 +11160,11 @@ icon_state = "platingdmg1" }, /area/xenoarch/caloriteresearch_powered) +"Yz" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/accessory/armband/science, +/turf/open/floor/carpet/royalblue, +/area/xenoarch/caloriteresearch_powered) "YC" = ( /obj/structure/rack/shelf, /turf/open/floor/plasteel, @@ -11096,6 +11198,10 @@ }, /turf/open/floor/plasteel, /area/xenoarch/caloriteresearch_powered) +"YV" = ( +/obj/machinery/porta_turret/fattening, +/turf/open/floor/mineral/basaltstone_floor, +/area/xenoarch/caloriteresearch_powered) "YW" = ( /obj/structure/cable{ icon_state = "1-2" @@ -11103,6 +11209,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/xenoarch/caloriteresearch_powered) +"YX" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/under/rank/security/blueshirt, +/obj/item/clothing/head/helmet/blueshirt, +/obj/item/clothing/suit/armor/vest/blueshirt, +/obj/item/clothing/shoes/jackboots, +/turf/open/floor/wood, +/area/xenoarch/caloriteresearch_powered) "Zh" = ( /obj/structure/closet/crate/trashcart, /obj/effect/decal/cleanable/dirt, @@ -63767,9 +63881,9 @@ yw sn DX DX -DX -DX -DX +YV +Kf +YV DX sn jV @@ -64749,7 +64863,7 @@ ab ab lQ lQ -lQ +rh Ml Qr BV @@ -65006,7 +65120,7 @@ ab ab Cg BP -lQ +Ss PJ Qr OA @@ -65018,7 +65132,7 @@ tN Kt Kt Kt -Kt +UN tN Kt Fq @@ -65262,8 +65376,8 @@ ab ab ab yw -lQ -lQ +rh +rh PJ Qr Sc @@ -65528,7 +65642,7 @@ XI If If If -If +tc If If If @@ -65547,7 +65661,7 @@ Ls YF Ht Wx -Vt +uG LH Vt Vt @@ -66059,8 +66173,8 @@ OB Ls Ls YF -SG -Vt +BY +uG Vt Vt SG @@ -66319,8 +66433,8 @@ YF Ht LH Wx -Vt -Vt +uG +NX SG TF Ls @@ -68117,7 +68231,7 @@ OA EV Np sJ -zz +SP zz QH wI @@ -68131,7 +68245,7 @@ KL Gc xl KL -SG +LM Zw Oa OA @@ -68386,7 +68500,7 @@ SG Kp Oa Iu -KL +ry Sn KU SG @@ -68651,7 +68765,7 @@ Oa OA xQ Lj -Ls +Ng Lj Tt Tj @@ -69402,7 +69516,7 @@ SG xd YW Kq -KL +vU Zw Kq Kq @@ -69414,7 +69528,7 @@ Jq ON Kq Zw -KL +vU SG KL Kq @@ -70192,7 +70306,7 @@ Ls OA AJ KL -SG +Pw Kq Kq Pw @@ -70704,7 +70818,7 @@ OA DL Ls OA -UL +YX Fw Bg OA @@ -70954,7 +71068,7 @@ JN Tt tp OA -Tn +Yz WM Br OA @@ -71218,7 +71332,7 @@ zl uz Tt OA -UL +PC rb we OA @@ -71732,7 +71846,7 @@ OA Ls Ls OA -UL +RK rb we OA @@ -74541,7 +74655,7 @@ ay Hz tZ Ej -NT +MF tC Hz Hz @@ -75840,7 +75954,7 @@ Hz Hz Hz tC -NT +MF NN ay ay diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index 551c7c81..3eb74d5c 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -111,8 +111,8 @@ GLOBAL_LIST_INIT(maintenance_loot, list( /obj/item/storage/daki = 3, //VERY IMPORTANT CIT CHANGE - adds bodypillows to maint /obj/item/storage/pill_bottle/penis_enlargement = 2, /obj/item/storage/pill_bottle/breast_enlargement = 2, - /obj/item/trash/fatoray_scrap1 = 2, //GS13 - added for researching fat guns - /obj/item/trash/fatoray_scrap2 = 2, + /obj/item/trash/fatoray_scrap1 = 1, //GS13 - added for researching fat guns + /obj/item/trash/fatoray_scrap2 = 1, //GS13 /obj/item/clothing/shoes/wheelys = 1, /obj/item/clothing/shoes/kindleKicks = 1, /obj/item/autosurgeon/penis = 1, diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 8a448af4..ca65ad70 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -686,7 +686,7 @@ important_info = "Keep your den in one piece and away from curious eyes! YOU AREN'T ALLOWED TO CAPTURE / FATTEN UP PEOPLE WHO DON'T DO NON-CON OR DIDN'T AGREE TO IT!!" outfit = /datum/outfit/feeders_den/fanatic mirrorcanloadappearance = TRUE - assignedrole = "Space fanatic" + assignedrole = "Space Agent" icon = 'icons/obj/machines/sleeper.dmi' icon_state = "sleeper_s" death = FALSE @@ -719,7 +719,7 @@ /obj/effect/mob_spawn/human/feeders_den/victim name = "Grease stained cryopod" - mob_name = "feeder victim" + mob_name = "Syndicate Prisoner" desc = "Through the grease-stained cryopod glass, you can see someone obese sleeping inside..." job_description = "Den Victim" short_desc = "You don't remember how you even got here." @@ -743,7 +743,7 @@ ..() /obj/effect/mob_spawn/human/feeders_den/victim/startfat(mob/living/carbon/human/new_spawn) - new_spawn.fatness = 1000 + new_spawn.fatness = 300 return ..() /obj/effect/mob_spawn/human/feeders_den/victim/special(mob/living/carbon/human/new_spawn) diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index efa5fd77..e8717fc8 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -1146,29 +1146,3 @@ var/datum/techweb_node/TN = i TW.add_point_list(TN.research_costs) return TW.printout_points() - - - -/////////////// GS13 - NUTRITIONAL TECHNOLOGY - -/datum/techweb_node/nutri_tech - id = "nutritech" - display_name = "Nutritional Technology" - description = "Ending world hunger was never made easier!" - prereq_ids = list("biotech") // add "engineering" if the designs get complicated later on - design_ids = list("calorite_collar") - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) - boost_item_paths = list(/obj/item/gun/energy/fatoray, /obj/item/gun/energy/fatoray/cannon, /obj/item/trash/fatoray_scrap1, /obj/item/trash/fatoray_scrap2) - export_price = 5000 - hidden = TRUE - -/datum/techweb_node/nutri_tools - id = "nutritech_tools" - display_name = "Nutri-Tech Tools" - description = "Ever wanted to reach your daily caloric intake in just 5 seconds?" - prereq_ids = list("biotech", "adv_engi") - design_ids = list("fatoray_weak", "fatoray_cannon_weak") - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) - boost_item_paths = list(/obj/item/gun/energy/fatoray, /obj/item/gun/energy/fatoray/cannon, /obj/item/trash/fatoray_scrap1, /obj/item/trash/fatoray_scrap2) - export_price = 10000 - hidden = TRUE diff --git a/code/modules/ruins/spaceruin_code/feeders_den.dm b/code/modules/ruins/spaceruin_code/feeders_den.dm deleted file mode 100644 index fb92d3dc..00000000 --- a/code/modules/ruins/spaceruin_code/feeders_den.dm +++ /dev/null @@ -1,21 +0,0 @@ -//////// feeder den, GS13 - -/obj/item/paper/fluff/ruins/feeder_den/hidden - name = "hastily scribbled note" - info = "It took so long for me to make this hideout, but it might all be in vain. In the short breaks when I'm not observed, I'm trying to fix this radio I managed to sneak by... but judging by how I can barely squeeze my ass past this stupid hole less and less each day, I might not fix it in time..." - -/obj/item/paper/fluff/ruins/feeder_den/report1 - name = "Captive report No 1" - info = "We've managed to obtain two captives - one woman, and one lizard. They seem promising so far... already quite chunky and eager to scarf down whatever we give them. It might be even easier to turn them into proper beds once we're past the chemical treatment." - -/obj/item/paper/fluff/ruins/feeder_den/report2 - name = "Captive report No 2" - info = "The woman seems to be showing great progress, we'll be moving her into the larger cell soon. The lizard guy is still a bit reluctant about eating himself into immobility... but no matter, we'll just double his portions. Perhaps a painfully overstuffed stomach will change his mind." - -/obj/item/paper/fluff/ruins/feeder_den/report3 - name = "Captive report No 3" - info = "We've captured another one! A curious space explorer, snooping near our entrance. Fierce bastard, even managed to cut my arm open! A short treatment of a room full of lipoifier smoke ensured that they won't be able to fit back into their hardsuit." - -/obj/item/paper/fluff/ruins/feeder_den/report4 - name = "Captive report No 4" - info = "(the page seems to be full of food stains, making the writing unreadable.)" diff --git a/code/modules/surgery/organs/augments_chest.dm b/code/modules/surgery/organs/augments_chest.dm index c722f956..4e4d055d 100644 --- a/code/modules/surgery/organs/augments_chest.dm +++ b/code/modules/surgery/organs/augments_chest.dm @@ -13,6 +13,8 @@ var/hunger_threshold = NUTRITION_LEVEL_STARVING var/synthesizing = 0 var/poison_amount = 5 + var/nutrition_amount = 50 + var/message = "You feel less hungry..." slot = ORGAN_SLOT_STOMACH_AID /obj/item/organ/cyberimp/chest/nutriment/on_life() @@ -21,8 +23,8 @@ if(owner.nutrition <= hunger_threshold) synthesizing = TRUE - to_chat(owner, "You feel less hungry...") - owner.nutrition += 50 + to_chat(owner, message) + owner.nutrition += nutrition_amount addtimer(CALLBACK(src, .proc/synth_cool), 50) /obj/item/organ/cyberimp/chest/nutriment/proc/synth_cool() diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 37f820fb..f96d0524 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1376,13 +1376,18 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes /datum/uplink_item/device_tools category = "Misc. Gadgets" - /datum/uplink_item/device_tools/fatnade //GS13 name = "Fattening Grenade" desc = "A smoke grenade with a special caloric mix inside it. Remember to wear internals upon using." - item = /obj/item/card/emag + item = /obj/item/grenade/chem_grenade/lipoifier_strong cost = 2 +/datum/uplink_item/device_tools/nutritech_turbo //GS13 + name = "Nutri-Pump TURBO Autosurgeon" + desc = "This implant was meant to prevent people from going hungry, but due to a flaw in its designs, it permanently produces a small amount of nutriment overtime." + item = /obj/item/autosurgeon/nutripump_turbo + cost = 3 + /datum/uplink_item/device_tools/emag name = "Cryptographic Sequencer" desc = "The cryptographic sequencer, electromagnetic card, or emag, is a small card that unlocks hidden functions \ diff --git a/tgstation.dme b/tgstation.dme index 196a60f9..8664f89c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3103,7 +3103,6 @@ #include "code\modules\ruins\spaceruin_code\crashedship.dm" #include "code\modules\ruins\spaceruin_code\deepstorage.dm" #include "code\modules\ruins\spaceruin_code\DJstation.dm" -#include "code\modules\ruins\spaceruin_code\feeders_den.dm" #include "code\modules\ruins\spaceruin_code\hilbertshotel.dm" #include "code\modules\ruins\spaceruin_code\listeningstation.dm" #include "code\modules\ruins\spaceruin_code\miracle.dm" @@ -3322,6 +3321,7 @@ #include "code\modules\zombie\organs.dm" #include "GainStation13\code\clothing\calorite_collar.dm" #include "GainStation13\code\game\sound.dm" +#include "GainStation13\code\game\lore_papers.dm" #include "GainStation13\code\game\area\ruins.dm" #include "GainStation13\code\machinery\fattening_turret.dm" #include "GainStation13\code\machinery\feeding_tube.dm" @@ -3340,9 +3340,11 @@ #include "GainStation13\code\modules\reagents\chemistry\recipes\fatchem.dm" #include "GainStation13\code\modules\reagents\chemistry\recipes\ROCKANDSTONEdrinks.dm" #include "GainStation13\code\modules\research\designs\nutri_designs.dm" +#include "GainStation13\code\modules\research\techweb\nutritech_nodes.dm" #include "GainStation13\code\modules\vending\gatocola.dm" #include "GainStation13\code\modules\vending\GBBurrito.dm" #include "GainStation13\code\modules\vending\mealdor.dm" +#include "GainStation13\code\modules\surgery\organs\augments.dm" #include "GainStation13\code\obj\items\minor_items.dm" #include "GainStation13\code\obj\structure\calorite_doors.dm" #include "GainStation13\code\obj\structure\scale.dm"