From 0c1c27b6d3a9518a6f9b1567567011e32055bb78 Mon Sep 17 00:00:00 2001 From: evilew Date: Sun, 19 May 2024 18:51:54 +0200 Subject: [PATCH] alt-ray reverser, mapping tweaks - added AL-T-Reverser: it puts your weight loss value to -2, meaning you will gain weight from all attempts at weight loss - included reverser into research trees - added lipoelectric gens into xenoarch and lavaland outposts - added altreverser into feeder den --- .../modules/research/designs/nutri_designs.dm | 11 ++++ .../research/techweb/nutritech_nodes.dm | 2 +- GainStation13/code/obj/weapons/alter_rays.dm | 27 ++++++++ _maps/RandomRuins/SpaceRuins/feeders_den.dmm | 2 +- _maps/map_files/Mining/Lavaland.dmm | 61 ++++++++++++++----- _maps/map_files/Mining/Lavaland_Lower.dmm | 25 +++++--- 6 files changed, 100 insertions(+), 28 deletions(-) diff --git a/GainStation13/code/modules/research/designs/nutri_designs.dm b/GainStation13/code/modules/research/designs/nutri_designs.dm index fa28e3d5..b0f2216a 100644 --- a/GainStation13/code/modules/research/designs/nutri_designs.dm +++ b/GainStation13/code/modules/research/designs/nutri_designs.dm @@ -34,6 +34,17 @@ category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SECURITY + +/datum/design/alter_ray + name = "AL-T-Ray: Reverser" + id = "alter_ray_reverser" + build_type = PROTOLATHE + materials = list(MAT_METAL = 10000, MAT_GLASS = 8000, MAT_CALORITE = 26000) + construction_time = 200 + build_path = /obj/item/gun/energy/laser/alter_ray/noloss + category = list("Weapons") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SECURITY + //nutritech tools /datum/design/calorite_collar name = "Calorite Collar" diff --git a/GainStation13/code/modules/research/techweb/nutritech_nodes.dm b/GainStation13/code/modules/research/techweb/nutritech_nodes.dm index 05ecff57..b7a3f2b4 100644 --- a/GainStation13/code/modules/research/techweb/nutritech_nodes.dm +++ b/GainStation13/code/modules/research/techweb/nutritech_nodes.dm @@ -16,7 +16,7 @@ display_name = "Nutri-Tech Weapons" 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", "alter_ray") + design_ids = list("fatoray_weak", "fatoray_cannon_weak", "alter_ray", "alter_ray_reverser") 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 diff --git a/GainStation13/code/obj/weapons/alter_rays.dm b/GainStation13/code/obj/weapons/alter_rays.dm index 9c232095..76245e1b 100644 --- a/GainStation13/code/obj/weapons/alter_rays.dm +++ b/GainStation13/code/obj/weapons/alter_rays.dm @@ -142,3 +142,30 @@ /obj/item/ammo_casing/energy/laser/lossrate_decrease projectile_type = /obj/item/projectile/alter_ray/lossrate_decrease select_name = "Weight Loss Decrease" + + + +//ALTRay for making someone gain from weight loss + +/obj/item/gun/energy/laser/alter_ray/noloss + name = "AL-T-Ray: Reverser" + desc = "This weapon is capable of altering one's body capabilities. This one reverse's ones body functions, to make it so weight loss results in weight gain." + ammo_type = list(/obj/item/ammo_casing/energy/laser/lossrate_reverse) + +/obj/item/ammo_casing/energy/laser/lossrate_reverse + projectile_type = /obj/item/projectile/alter_ray/lossrate_reverse + select_name = "Weight Loss Reverse" + +/obj/item/projectile/alter_ray/lossrate_reverse + ratechange_amount = -2 + icon_state="laser" + +/obj/item/projectile/alter_ray/lossrate_reverse/on_hit(atom/target, blocked) + . = ..() + + var/mob/living/carbon/gainer = target + + if(iscarbon(gainer)) + gainer.weight_loss_rate = ratechange_amount + return TRUE + diff --git a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm index 0f9b7909..52efe894 100644 --- a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm +++ b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm @@ -7,7 +7,7 @@ "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},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals6"},/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals8"},/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) +"bU" = (/obj/structure/chair/sofa/left,/obj/machinery/button/door{name = "Window Shutters North"; id = "feederden_north"; pixel_y = 25},/obj/item/gun/energy/laser/alter_ray/noloss{pixel_x = -8; pixel_y = -5},/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) diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 18993cb0..af4fc22a 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -1907,7 +1907,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/open/floor/plating, /area/mine/living_quarters) "dI" = ( @@ -2615,9 +2617,6 @@ /turf/open/floor/plasteel, /area/mine/living_quarters) "eT" = ( -/obj/machinery/light/small{ - dir = 1 - }, /obj/item/reagent_containers/glass/bucket, /obj/item/mop, /turf/open/floor/plating, @@ -2681,6 +2680,17 @@ }, /turf/open/floor/plasteel, /area/mine/living_quarters) +"fo" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/turf/open/floor/plating, +/area/mine/living_quarters) "fq" = ( /obj/structure/stone_tile{ dir = 4 @@ -4079,12 +4089,21 @@ }, /turf/open/floor/plating, /area/mine/laborcamp) +"uu" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/mine/living_quarters) "uM" = ( /obj/machinery/light/small{ dir = 8 }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/mine/eva) +"uP" = ( +/turf/closed/wall, +/area/lavaland/surface/outdoors) "uS" = ( /obj/docking_port/stationary{ area_type = /area/lavaland/surface/outdoors; @@ -4411,6 +4430,12 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1, /turf/open/floor/plasteel/dark, /area/mine/maintenance) +"EG" = ( +/obj/structure/cable, +/obj/machinery/power/adipoelectric_generator, +/obj/machinery/light/small, +/turf/open/floor/plating, +/area/mine/living_quarters) "EI" = ( /obj/machinery/telecomms/relay/preset/mining, /obj/machinery/light/small{ @@ -4533,6 +4558,10 @@ /obj/machinery/mineral/processing_unit_console, /turf/closed/wall, /area/mine/production) +"Ik" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/plating, +/area/mine/living_quarters) "In" = ( /obj/machinery/mineral/processing_unit{ dir = 1 @@ -17230,7 +17259,7 @@ PQ PQ PQ PQ -Wp +uP Wp Wp Wp @@ -17485,9 +17514,9 @@ el CH rI EM +fo dG -PQ -Wp +uP Wp Wp Wp @@ -17742,9 +17771,9 @@ en PQ dA eN +uu FS -PQ -Wp +uP Wp Wp Wp @@ -18000,8 +18029,8 @@ ey dB dF dH -PQ -Wp +EG +uP Wp Wp Wp @@ -18257,8 +18286,8 @@ PQ eT wu dI -PQ -Wp +eN +uP Wp Wp Wp @@ -18514,8 +18543,8 @@ PQ Di ew ew -PQ -Wp +Ik +uP Wp Wp Wp @@ -18772,7 +18801,7 @@ PQ PQ PQ PQ -Wp +uP Wp Wp Wp diff --git a/_maps/map_files/Mining/Lavaland_Lower.dmm b/_maps/map_files/Mining/Lavaland_Lower.dmm index cb52ecec..4f419ae9 100644 --- a/_maps/map_files/Mining/Lavaland_Lower.dmm +++ b/_maps/map_files/Mining/Lavaland_Lower.dmm @@ -523,7 +523,6 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/space_heater, /turf/open/floor/plasteel/dark/side{ dir = 8 }, @@ -1013,9 +1012,6 @@ /turf/open/floor/plating, /area/xenoarch/gen) "cz" = ( -/obj/machinery/power/port_gen/pacman{ - anchored = 1 - }, /obj/effect/turf_decal/box, /obj/structure/cable{ icon_state = "0-2" @@ -1023,18 +1019,17 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/adipoelectric_transformer, /turf/open/floor/plasteel/dark/side{ dir = 9 }, /area/xenoarch/gen) "cA" = ( -/obj/machinery/power/port_gen/pacman{ - anchored = 1 - }, /obj/effect/turf_decal/box, /obj/structure/cable{ icon_state = "0-2" }, +/obj/machinery/power/adipoelectric_generator, /turf/open/floor/plasteel/dark/side{ dir = 1 }, @@ -1923,7 +1918,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -12819,6 +12813,17 @@ }, /turf/open/floor/plasteel, /area/xenoarch/caloriteresearch_powered) +"Tu" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/space_heater, +/turf/open/floor/plasteel, +/area/xenoarch/arch) "Tv" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 4; @@ -16633,7 +16638,7 @@ Sy ar ar ar -ar +dr ar ar ar @@ -22024,7 +22029,7 @@ fL Kg aW aC -VP +Tu fL bL cu