diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 0bf7ba61503..0b05d03e0b4 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -574,6 +574,23 @@ }, /turf/open/floor/carpet/black, /area/centcom/holding) +"cA" = ( +/obj/item/storage/box/emps{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/flashbangs, +/obj/item/grenade/c4/x4, +/obj/item/grenade/c4/x4, +/obj/item/grenade/c4/x4, +/obj/structure/table/reinforced, +/obj/item/clothing/ears/earmuffs, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/admin/storage) "cD" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -823,16 +840,6 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/open/floor/grass, /area/centcom/holding) -"dw" = ( -/obj/structure/reagent_dispensers/wall/peppertank/directional/west, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/centcom/control) "dB" = ( /obj/effect/turf_decal/tile/yellow/half, /obj/effect/turf_decal/tile/yellow/half{ @@ -1268,6 +1275,10 @@ /obj/machinery/duct, /turf/open/floor/carpet/black, /area/centcom/holding) +"fr" = ( +/obj/machinery/limbgrower/fullupgrade, +/turf/open/floor/plating/abductor, +/area/abductor_ship) "fs" = ( /obj/effect/turf_decal/tile/yellow/half, /obj/effect/turf_decal/tile/yellow/half{ @@ -1973,6 +1984,21 @@ /obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron, /area/centcom/control) +"ix" = ( +/obj/item/storage/box/emps{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/flashbangs, +/obj/item/grenade/c4/x4, +/obj/item/grenade/c4/x4, +/obj/item/grenade/c4/x4, +/obj/structure/table/reinforced, +/obj/item/clothing/ears/earmuffs, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/centcom/control) "iy" = ( /obj/structure/table/reinforced, /obj/item/restraints/handcuffs/cable/zipties, @@ -2230,6 +2256,14 @@ }, /turf/open/floor/iron, /area/centcom/supply) +"jg" = ( +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/centcom/control) "jh" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -3180,10 +3214,6 @@ "li" = ( /turf/open/floor/plating/abductor, /area/abductor_ship) -"lj" = ( -/obj/structure/closet/abductor, -/turf/open/floor/plating/abductor, -/area/abductor_ship) "lk" = ( /turf/closed/indestructible/abductor{ icon_state = "alien15" @@ -3964,6 +3994,16 @@ }, /turf/open/floor/iron/dark, /area/centcom/control) +"mW" = ( +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/centcom/control) "mX" = ( /obj/structure/table/reinforced, /obj/item/restraints/handcuffs/cable/zipties, @@ -5435,16 +5475,6 @@ /obj/item/mop, /turf/open/floor/iron/freezer, /area/syndicate_mothership/control) -"qQ" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/syringes, -/obj/item/gun/syringe/rapidsyringe, -/obj/structure/reagent_dispensers/wall/peppertank/directional/south, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/centcom/briefing/storage) "qR" = ( /obj/structure/sign/nanotrasen, /turf/closed/indestructible/riveted, @@ -5664,23 +5694,6 @@ /obj/structure/sign/warning/securearea, /turf/closed/indestructible/riveted, /area/centcom/ferry) -"rA" = ( -/obj/structure/table/wood, -/obj/item/storage/photo_album, -/obj/item/camera, -/obj/structure/reagent_dispensers/wall/peppertank/directional/north, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/centcom/admin) "rF" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/grassybush, @@ -5837,6 +5850,27 @@ }, /turf/open/floor/iron/dark, /area/centcom/control) +"rR" = ( +/obj/item/storage/box/ids{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/silver_ids, +/obj/structure/table/reinforced, +/obj/machinery/newscaster/security_unit/directional/north, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/centcom/control) "rS" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -6354,43 +6388,6 @@ /obj/machinery/vending/boozeomat, /turf/open/floor/wood, /area/syndicate_mothership/control) -"tB" = ( -/obj/item/storage/box/ids{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/silver_ids, -/obj/structure/table/reinforced, -/obj/structure/reagent_dispensers/wall/peppertank/directional/east, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/centcom/evac) -"tC" = ( -/obj/item/storage/box/emps{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/flashbangs, -/obj/item/grenade/c4/x4, -/obj/item/grenade/c4/x4, -/obj/item/grenade/c4/x4, -/obj/structure/table/reinforced, -/obj/item/clothing/ears/earmuffs, -/obj/structure/reagent_dispensers/wall/peppertank/directional/east, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/centcom/admin/storage) "tJ" = ( /obj/item/kirbyplants{ icon_state = "plant-22" @@ -9480,6 +9477,23 @@ }, /turf/open/floor/iron/dark, /area/centcom/evac) +"CT" = ( +/obj/structure/table/wood, +/obj/item/storage/photo_album, +/obj/item/camera, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/centcom/admin) "CV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/grimy, @@ -9803,6 +9817,26 @@ }, /turf/open/floor/iron/dark, /area/centcom/evac) +"DB" = ( +/obj/item/storage/box/ids{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/silver_ids, +/obj/structure/table/reinforced, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/centcom/evac) "DC" = ( /obj/machinery/door/airlock{ icon = 'icons/obj/doors/airlocks/station/uranium.dmi'; @@ -10642,6 +10676,16 @@ dir = 1 }, /area/centcom/holding) +"FB" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/syringes, +/obj/item/gun/syringe/rapidsyringe, +/obj/structure/reagent_dispensers/wall/peppertank/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/briefing/storage) "FC" = ( /obj/structure/flora/rock/pile/largejungle, /turf/open/floor/plating/beach/sand, @@ -12264,14 +12308,6 @@ }, /turf/open/floor/iron, /area/tdome/arena) -"IO" = ( -/obj/structure/reagent_dispensers/wall/peppertank/directional/west, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/iron, -/area/centcom/control) "IQ" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/grassybush, @@ -14437,27 +14473,6 @@ /obj/item/food/grown/watermelon, /turf/open/floor/carpet/black, /area/centcom/holding) -"PQ" = ( -/obj/item/storage/box/ids{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/silver_ids, -/obj/structure/table/reinforced, -/obj/machinery/newscaster/security_unit/directional/north, -/obj/structure/reagent_dispensers/wall/peppertank/directional/east, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/centcom/control) "PR" = ( /obj/structure/table/wood, /obj/item/phone{ @@ -14872,11 +14887,6 @@ "RN" = ( /turf/open/floor/iron/stairs/medium, /area/centcom/holding) -"RQ" = ( -/obj/structure/closet/abductor, -/obj/item/storage/box/alienhandcuffs, -/turf/open/floor/plating/abductor, -/area/abductor_ship) "RU" = ( /obj/machinery/modular_computer/console/preset/id/centcom, /obj/machinery/status_display/ai/directional/north, @@ -15785,6 +15795,12 @@ }, /turf/open/floor/iron, /area/centcom/supplypod/loading/two) +"Vl" = ( +/obj/structure/closet/abductor, +/obj/item/storage/box/alienhandcuffs, +/obj/item/reagent_containers/glass/beaker/synthflesh, +/turf/open/floor/plating/abductor, +/area/abductor_ship) "Vn" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/iron, @@ -16691,21 +16707,6 @@ /obj/machinery/door/window/survival_pod, /turf/open/floor/iron/showroomfloor, /area/centcom/holding) -"Zj" = ( -/obj/item/storage/box/emps{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/flashbangs, -/obj/item/grenade/c4/x4, -/obj/item/grenade/c4/x4, -/obj/item/grenade/c4/x4, -/obj/structure/table/reinforced, -/obj/item/clothing/ears/earmuffs, -/obj/structure/reagent_dispensers/wall/peppertank/directional/north, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/centcom/control) "Zk" = ( /obj/effect/turf_decal/tile/yellow/half{ dir = 4 @@ -18917,9 +18918,9 @@ aa aa ks kP -RQ +Vl lG -lj +fr mw nf aa @@ -18944,9 +18945,9 @@ aa aa ks kP -RQ +Vl lG -lj +fr mw nf aa @@ -18974,9 +18975,9 @@ aa aa ks kP -RQ +Vl lG -lj +fr mw nf aa @@ -19001,9 +19002,9 @@ aa aa ks kP -RQ +Vl lG -lj +fr mw nf aa @@ -53876,7 +53877,7 @@ aa aa aa On -rA +CT Xq XS Xq @@ -57239,7 +57240,7 @@ SK bj Pt ZD -qQ +FB Ya aa aa @@ -57739,7 +57740,7 @@ Ni YU hY hf -tC +cA YU va oe @@ -62083,7 +62084,7 @@ iC iJ iT iT -IO +jg iT iT jz @@ -63363,7 +63364,7 @@ aa aa aa io -Zj +ix iE iE iW @@ -64419,7 +64420,7 @@ iu io io io -PQ +rR iC dR uy @@ -66208,7 +66209,7 @@ in lx lR ml -dw +mW nv nQ iC @@ -67778,7 +67779,7 @@ qx Ch CR Dh -tB +DB Yn Yn Yn diff --git a/_maps/map_files/generic/CentCom_skyrat.dmm b/_maps/map_files/generic/CentCom_skyrat.dmm index 19f4b2553e1..acf1e036763 100644 --- a/_maps/map_files/generic/CentCom_skyrat.dmm +++ b/_maps/map_files/generic/CentCom_skyrat.dmm @@ -161,6 +161,10 @@ }, /turf/open/floor/iron/dark, /area/centcom/briefing/storage) +"cw" = ( +/obj/machinery/limbgrower/fullupgrade, +/turf/open/floor/plating/abductor, +/area/abductor_ship) "da" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/neutral{ @@ -1707,10 +1711,6 @@ "li" = ( /turf/open/floor/plating/abductor, /area/abductor_ship) -"lj" = ( -/obj/structure/closet/abductor, -/turf/open/floor/plating/abductor, -/area/abductor_ship) "lk" = ( /turf/closed/indestructible/abductor{ icon_state = "alien15" @@ -13940,6 +13940,12 @@ }, /turf/open/floor/iron/white, /area/centcom/holding) +"Nq" = ( +/obj/structure/closet/abductor, +/obj/item/storage/box/alienhandcuffs, +/obj/item/reagent_containers/glass/beaker/synthflesh, +/turf/open/floor/plating/abductor, +/area/abductor_ship) "Nv" = ( /obj/structure/table, /turf/open/floor/iron/cafeteria, @@ -14497,11 +14503,6 @@ }, /turf/open/floor/carpet/black, /area/centcom/holding) -"RQ" = ( -/obj/structure/closet/abductor, -/obj/item/storage/box/alienhandcuffs, -/turf/open/floor/plating/abductor, -/area/abductor_ship) "RS" = ( /obj/machinery/light/directional/west, /obj/structure/rack, @@ -15771,6 +15772,11 @@ aa aa aa aa +kK +lg +lB +lX +mr aa aa aa @@ -15793,16 +15799,11 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +kK +lg +lB +lX +mr aa aa LV @@ -15998,35 +15999,6 @@ aa aa aa aa -kK -lg -lB -lX -mr -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa kK lg @@ -16055,12 +16027,41 @@ aa aa aa aa -kK -lg -lB -lX -mr aa +ko +kL +JF +lC +lY +ms +nb +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ko +kL +LS +lC +lY +ms +nb aa LV LW @@ -16254,6 +16255,7 @@ aa aa aa aa +aa ko kL Be @@ -16283,14 +16285,13 @@ aa aa aa aa -aa -ko -kL -JF -lC -lY -ms -nb +kp +JA +li +JM +li +mt +nc aa aa aa @@ -16311,13 +16312,13 @@ aa aa aa aa -ko -kL -LS -lC -lY -ms -nb +kp +LK +li +LT +li +mt +nc aa LV LW @@ -16511,6 +16512,7 @@ aa aa aa aa +aa kp Au li @@ -16540,14 +16542,13 @@ aa aa aa aa -aa -kp -JA +kq +JB li -JM +lE li -mt -nc +mu +nd aa aa aa @@ -16568,13 +16569,13 @@ aa aa aa aa -kp -LK +kq +LL li -LT +lE li -mt -nc +mu +nd aa LV LW @@ -16768,6 +16769,7 @@ aa aa aa aa +aa kq Av li @@ -16797,14 +16799,13 @@ aa aa aa aa -aa -kq -JB +kr +JC li -lE +JN li -mu -nd +mv +ne aa aa aa @@ -16825,13 +16826,13 @@ aa aa aa aa -kq -LL +kr +LM li -lE +LU li -mu -nd +mv +ne aa LV LW @@ -17025,6 +17026,7 @@ aa aa aa aa +aa kr Aw li @@ -17054,14 +17056,13 @@ aa aa aa aa -aa -kr -JC -li -JN -li -mv -ne +ks +kP +Nq +lG +cw +mw +nf aa aa aa @@ -17082,13 +17083,13 @@ aa aa aa aa -kr -LM -li -LU -li -mv -ne +ks +kP +Nq +lG +cw +mw +nf aa LV LW @@ -17257,9 +17258,9 @@ aa aa ks kP -RQ +Nq lG -lj +cw mw nf aa @@ -17282,41 +17283,12 @@ aa aa aa aa -ks -kP -RQ -lG -lj -mw -nf -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa ks kP -RQ +Nq lG -lj +cw mw nf aa @@ -17339,13 +17311,42 @@ aa aa aa aa -ks -kP -RQ -lG -lj -mw -nf +aa +aa +aa +kQ +lk +lH +lZ +mx +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +kQ +lk +lH +lZ +mx +aa aa LV LW @@ -17540,35 +17541,6 @@ aa aa aa aa -kQ -lk -lH -lZ -mx -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa kQ lk @@ -17597,11 +17569,40 @@ aa aa aa aa -kQ -lk -lH -lZ -mx +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa LV diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index 9130bf6da9a..56dd12588ff 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -263,6 +263,19 @@ return FALSE return TRUE +/obj/machinery/limbgrower/fullupgrade //Inherently cheaper organ production. This is to NEVER be inherently emagged, no valids. + desc = "It grows new limbs using Synthflesh. This alien model seems more efficient." + obj_flags = CAN_BE_HIT + flags_1 = NODECONSTRUCT_1 + circuit = /obj/item/circuitboard/machine/limbgrower/fullupgrade + +/obj/machinery/limbgrower/fullupgrade/Initialize(mapload) + . = ..() + for(var/id in SSresearch.techweb_designs) + var/datum/design/found_design = SSresearch.techweb_design_by_id(id) + if((found_design.build_type & LIMBGROWER) && !("emagged" in found_design.category)) + stored_research.add_design(found_design) + /// Emagging a limbgrower allows you to build synthetic armblades. /obj/machinery/limbgrower/emag_act(mob/user) if(obj_flags & EMAGGED) diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 50503e9b6c4..1ccd7eb5bf1 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -754,6 +754,15 @@ /obj/item/reagent_containers/glass/beaker = 2, /obj/item/stack/sheet/glass = 1) +/obj/item/circuitboard/machine/limbgrower/fullupgrade + name = "Limb Grower (Machine Board)" + greyscale_colors = CIRCUIT_COLOR_MEDICAL + build_path = /obj/machinery/limbgrower + req_components = list( + /obj/item/stock_parts/manipulator/femto = 1, + /obj/item/reagent_containers/glass/beaker/bluespace = 2, + /obj/item/stack/sheet/glass = 1) + /obj/item/circuitboard/machine/protolathe/department/medical name = "Departmental Protolathe (Machine Board) - Medical" greyscale_colors = CIRCUIT_COLOR_MEDICAL diff --git a/code/modules/antagonists/abductor/abductee/abductee.dm b/code/modules/antagonists/abductor/abductee/abductee.dm index 56ef32d7af9..16a4ad091eb 100644 --- a/code/modules/antagonists/abductor/abductee/abductee.dm +++ b/code/modules/antagonists/abductor/abductee/abductee.dm @@ -20,9 +20,6 @@ owner.announce_objectives() /datum/antagonist/abductee/proc/give_objective() - var/mob/living/carbon/human/H = owner.current - if(istype(H)) - H.gain_trauma_type(BRAIN_TRAUMA_MILD, TRAUMA_RESILIENCE_LOBOTOMY) var/objtype = (prob(75) ? /datum/objective/abductee/random : pick(subtypesof(/datum/objective/abductee/) - /datum/objective/abductee/random)) var/datum/objective/abductee/O = new objtype() objectives += O diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 0b05ec37bea..83289323289 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -740,5 +740,7 @@ /datum/reagent/drug/space_drugs, /datum/reagent/toxin, /datum/reagent/toxin/plasma, - /datum/reagent/uranium + /datum/reagent/uranium, + /datum/reagent/consumable/liquidelectricity/enriched, + /datum/reagent/medicine/c2/synthflesh )