diff --git a/_maps/map_files/NSVBlueshift/Blueshift.dmm b/_maps/map_files/NSVBlueshift/Blueshift.dmm index 11d9fe41578..011ae01bd4a 100644 --- a/_maps/map_files/NSVBlueshift/Blueshift.dmm +++ b/_maps/map_files/NSVBlueshift/Blueshift.dmm @@ -159,11 +159,6 @@ "acy" = ( /turf/closed/wall/r_wall, /area/station/science/explab) -"acB" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/power_station) "acE" = ( /obj/machinery/holopad, /obj/effect/landmark/event_spawn, @@ -435,7 +430,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/security/power_station) +/area/station/maintenance/port/fore) "aeQ" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/delivery, @@ -4553,7 +4548,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/light/small/directional/east, /turf/open/floor/plating, -/area/station/service/power_station) +/area/station/maintenance/starboard/fore) "aVo" = ( /obj/machinery/power/shuttle_engine/propulsion/burst, /turf/open/floor/engine/hull/reinforced, @@ -4809,9 +4804,6 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"aXM" = ( -/turf/closed/wall, -/area/station/security/power_station) "aXP" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -5147,9 +5139,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/maintenance/department/engineering/engine_aft_port) -"bbm" = ( -/turf/closed/wall/r_wall, -/area/station/security/power_station) "bbn" = ( /obj/structure/filingcabinet/security, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -6297,7 +6286,7 @@ }, /obj/machinery/power/port_gen/pacman/pre_loaded, /turf/open/floor/iron/dark, -/area/station/security/power_station) +/area/station/maintenance/port/fore) "bmP" = ( /obj/machinery/door/airlock/maintenance/glass, /obj/structure/cable, @@ -7460,14 +7449,11 @@ /turf/open/floor/iron/shuttle/arrivals/airless, /area/space/nearstation) "bxx" = ( -/obj/effect/turf_decal/stripes{ - dir = 1 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, /turf/open/floor/iron/dark, -/area/station/service/power_station) +/area/station/maintenance/starboard/fore) "bxy" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7737,13 +7723,6 @@ }, /turf/open/floor/iron, /area/station/medical/medbay/central) -"bzC" = ( -/obj/machinery/computer/monitor{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/service/power_station) "bzG" = ( /obj/machinery/light/no_nightlight/directional/west, /obj/structure/sign/poster/random/directional/west, @@ -9209,14 +9188,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) -"bOO" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/service/power_station) "bOR" = ( /obj/machinery/duct, /turf/open/floor/iron, @@ -9645,7 +9616,7 @@ /obj/effect/mapping_helpers/broken_floor, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/service/power_station) +/area/station/maintenance/starboard/fore) "bSN" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/wood/parquet, @@ -11760,16 +11731,12 @@ }, /area/station/commons/fitness/recreation) "cnf" = ( -/obj/machinery/door/airlock/engineering{ - name = "Security Power Station" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/any/security/hos, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating, -/area/station/security/power_station) +/area/station/maintenance/port/fore) "cnk" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -13517,14 +13484,6 @@ /obj/effect/spawner/random/armory/rubbershot, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"cBY" = ( -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/obj/machinery/power/smes/engineering, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/power_station) "cCd" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -13976,14 +13935,10 @@ /turf/open/floor/iron, /area/station/security/execution/transfer) "cFK" = ( -/obj/effect/turf_decal/stripes{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/turf/open/floor/iron/dark, -/area/station/medical/power_station) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/command/heads_quarters/cmo) "cFN" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -14294,11 +14249,9 @@ /area/station/common/pool) "cHP" = ( /obj/structure/cable, -/obj/effect/turf_decal/stripes{ - dir = 8 - }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/iron/dark, -/area/station/service/power_station) +/area/station/maintenance/starboard/fore) "cHT" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, @@ -16683,16 +16636,13 @@ /area/station/maintenance/aft/upper) "dfX" = ( /obj/effect/mapping_helpers/burnt_floor, -/obj/machinery/power/terminal{ - dir = 4 - }, /obj/structure/cable, /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/open/floor/iron/dark, -/area/station/security/power_station) +/area/station/maintenance/port/fore) "dga" = ( /obj/machinery/light/directional/north, /turf/open/floor/circuit, @@ -18218,13 +18168,12 @@ /area/station/science/auxlab/firing_range) "dvv" = ( /obj/structure/cable, -/obj/machinery/computer/monitor, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" }, /turf/open/floor/iron/dark, -/area/station/science/power_station) +/area/station/maintenance/aft/upper) "dvx" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -19812,8 +19761,8 @@ /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" }, -/turf/closed/wall, -/area/station/medical/power_station) +/turf/closed/wall/r_wall, +/area/station/command/heads_quarters/cmo) "dKI" = ( /obj/structure/flora/bush/jungle/b/style_2, /obj/structure/flora/bush/flowers_pp/style_3, @@ -20908,12 +20857,6 @@ /obj/structure/window/reinforced/fulltile, /turf/open/floor/grass, /area/station/hallway/secondary/entry) -"dWg" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/service/power_station) "dWt" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line{ @@ -22207,7 +22150,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/science/power_station) +/area/station/maintenance/aft/upper) "ekI" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 6 @@ -22384,7 +22327,7 @@ /obj/machinery/light/small/directional/north, /obj/structure/rack, /turf/open/floor/iron/dark, -/area/station/science/power_station) +/area/station/maintenance/aft/upper) "emk" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -22798,11 +22741,8 @@ /turf/open/floor/iron, /area/station/science/ordnance) "erj" = ( -/obj/effect/turf_decal/stripes{ - dir = 8 - }, /turf/open/floor/iron/dark, -/area/station/service/power_station) +/area/station/maintenance/starboard/fore) "erk" = ( /obj/item/shard, /turf/open/floor/plating, @@ -28334,10 +28274,6 @@ /obj/structure/sign/departments/restroom/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/upper) -"fpW" = ( -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/power_station) "fpY" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Engineering Maintenance" @@ -28461,8 +28397,6 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical/central) "fqV" = ( -/obj/structure/bookcase/random/nonfiction, -/obj/item/radio/intercom/directional/east, /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/cmo) "frb" = ( @@ -33206,14 +33140,10 @@ /area/station/command/heads_quarters/captain/private) "gnt" = ( /obj/structure/noticeboard/directional/east, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/turf/open/floor/iron/dark, -/area/station/medical/power_station) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/command/heads_quarters/cmo) "gnw" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -34971,14 +34901,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/service/bar/atrium) -"gFE" = ( -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/obj/machinery/power/smes, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/power_station) "gFG" = ( /obj/structure/table/wood/fancy/red, /obj/item/storage/fancy/cigarettes/cigars/cohiba{ @@ -35825,10 +35747,9 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical/central) "gOx" = ( -/obj/machinery/power/smes/engineering, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/science/power_station) +/area/station/maintenance/aft/upper) "gOy" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -36021,11 +35942,6 @@ "gPZ" = ( /turf/closed/wall/r_wall, /area/station/cargo/power_station/upper) -"gQa" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/medical/power_station) "gQe" = ( /obj/structure/weightmachine, /obj/structure/extinguisher_cabinet/directional/north, @@ -38564,7 +38480,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/station/security/power_station) +/area/station/maintenance/port/fore) "hrb" = ( /obj/item/weldingtool, /obj/item/weldingtool, @@ -39980,10 +39896,9 @@ /turf/open/floor/iron/white/textured, /area/station/medical/aslyum) "hFX" = ( -/obj/machinery/power/smes, /obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/medical/power_station) +/turf/open/floor/iron, +/area/station/command/heads_quarters/cmo) "hFZ" = ( /turf/open/floor/iron/white/textured, /area/station/common/cryopods) @@ -40036,16 +39951,6 @@ dir = 8 }, /area/station/commons/dorms) -"hGT" = ( -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/sign/warning/electric_shock/directional/north, -/turf/open/floor/plating, -/area/station/maintenance/department/medical) "hGU" = ( /obj/structure/closet/crate{ icon_state = "crateopen" @@ -40947,7 +40852,6 @@ }, /obj/effect/spawner/random/trash/grille_or_waste, /obj/machinery/light/small/directional/west, -/obj/structure/sign/warning/electric_shock/directional/west, /turf/open/floor/plating, /area/station/maintenance/department/medical) "hOY" = ( @@ -42761,7 +42665,7 @@ }, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/security/power_station) +/area/station/maintenance/port/fore) "igR" = ( /obj/effect/turf_decal/siding/thinplating/dark/end{ dir = 1 @@ -44243,7 +44147,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/station/service/power_station) +/area/station/maintenance/starboard/fore) "iwl" = ( /obj/effect/turf_decal/delivery/red, /obj/machinery/door/airlock/security/old{ @@ -44446,12 +44350,11 @@ /turf/open/floor/plating, /area/station/maintenance/cult_chapel_maint) "ixJ" = ( -/obj/machinery/airalarm/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/service/power_station) +/area/station/maintenance/starboard/fore) "ixK" = ( /obj/structure/chair/office{ dir = 1 @@ -44755,14 +44658,10 @@ }, /area/station/cargo/miningdock) "iBd" = ( -/obj/machinery/door/airlock/engineering{ - name = "Science Power Station" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/any/science/rd, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating, -/area/station/science/power_station) +/area/station/maintenance/aft/upper) "iBm" = ( /obj/machinery/vending/wardrobe/curator_wardrobe, /obj/effect/turf_decal/bot, @@ -45309,16 +45208,9 @@ /area/station/command/heads_quarters/nt_rep) "iGu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/medical/power_station) +/turf/open/floor/iron, +/area/station/command/heads_quarters/cmo) "iGA" = ( /obj/structure/rack, /obj/effect/turf_decal/bot, @@ -47776,13 +47668,9 @@ /turf/open/floor/iron, /area/station/engineering/transit_tube) "jgq" = ( -/obj/machinery/power/terminal, /obj/structure/cable, /obj/machinery/airalarm/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, /obj/effect/turf_decal/stripes, /obj/machinery/camera/directional/north{ c_tag = "Science - Power Station"; @@ -47790,7 +47678,7 @@ network = list("ss13","ce") }, /turf/open/floor/iron/dark, -/area/station/science/power_station) +/area/station/maintenance/aft/upper) "jgr" = ( /obj/structure/light_construct/directional/east, /turf/open/floor/iron, @@ -47918,7 +47806,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/station/security/power_station) +/area/station/maintenance/port/fore) "jhU" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -49131,9 +49019,6 @@ /obj/effect/spawner/random/entertainment/arcade, /turf/open/floor/eighties/red, /area/station/common/arcade) -"jte" = ( -/turf/closed/wall, -/area/station/service/power_station) "jtm" = ( /obj/structure/cable, /obj/machinery/door/airlock/maintenance_hatch, @@ -49220,15 +49105,12 @@ "jub" = ( /obj/machinery/airalarm/directional/west, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/turf_decal/stripes{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" }, -/obj/machinery/power/port_gen/pacman/pre_loaded, -/turf/open/floor/iron/dark, -/area/station/medical/power_station) +/obj/machinery/chem_master, +/turf/open/floor/iron, +/area/station/command/heads_quarters/cmo) "jui" = ( /obj/machinery/door/airlock/maintenance{ name = "Council of Practical Gags" @@ -50647,17 +50529,15 @@ /turf/open/floor/iron/white/smooth_large, /area/station/command/heads_quarters/ce) "jId" = ( -/obj/effect/turf_decal/stripes{ - dir = 8 - }, /obj/structure/rack, /obj/machinery/camera/directional/north{ c_tag = "Service - Power Station"; name = "engineering camera"; network = list("ss13","ce") }, +/obj/item/stack/sheet/mineral/plasma/thirty, /turf/open/floor/iron/dark, -/area/station/service/power_station) +/area/station/maintenance/starboard/fore) "jIf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -51567,7 +51447,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/security/power_station) +/area/station/maintenance/port/fore) "jQG" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/firecloset, @@ -52230,10 +52110,9 @@ /area/station/command/heads_quarters/qm) "jVT" = ( /obj/effect/mapping_helpers/broken_floor, -/obj/machinery/power/smes/engineering, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/security/power_station) +/area/station/maintenance/port/fore) "jVV" = ( /obj/effect/turf_decal/stripes{ dir = 8 @@ -54841,9 +54720,8 @@ }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating, -/area/station/service/power_station) +/area/station/maintenance/starboard/fore) "kuh" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt{ @@ -55488,14 +55366,10 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "kAe" = ( -/obj/machinery/door/airlock/engineering{ - name = "Security Power Station" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/any/security/hos, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating, -/area/station/security/power_station) +/area/station/maintenance/port/fore) "kAh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/duct, @@ -56229,13 +56103,12 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "kHP" = ( -/obj/machinery/power/terminal, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/stripes, /turf/open/floor/iron/dark, -/area/station/science/power_station) +/area/station/maintenance/aft/upper) "kHV" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -58524,15 +58397,9 @@ /turf/open/floor/iron, /area/station/maintenance/department/medical/central) "lge" = ( -/obj/effect/turf_decal/stripes{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/medical/power_station) +/turf/open/floor/iron, +/area/station/command/heads_quarters/cmo) "lgi" = ( /obj/effect/turf_decal/bot, /obj/structure/reagent_dispensers/fueltank, @@ -59240,9 +59107,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/warden) -"lnJ" = ( -/turf/closed/wall/rust, -/area/station/service/power_station) "lnM" = ( /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) @@ -59431,11 +59295,6 @@ /obj/machinery/suit_storage_unit/standard_unit, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) -"lpQ" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/science/power_station) "lpR" = ( /obj/effect/turf_decal/bot_red, /obj/machinery/doppler_array, @@ -59810,9 +59669,8 @@ }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating, -/area/station/service/power_station) +/area/station/maintenance/starboard/fore) "ltF" = ( /obj/structure/filingcabinet, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -59871,7 +59729,7 @@ /obj/structure/rack, /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, -/area/station/security/power_station) +/area/station/maintenance/port/fore) "luf" = ( /obj/structure/closet/secure_closet/personal/cabinet, /turf/open/floor/carpet/red, @@ -62049,7 +61907,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, -/area/station/science/power_station) +/area/station/maintenance/aft/upper) "lQA" = ( /obj/structure/table/wood, /obj/structure/window/spawner/directional/south, @@ -62899,16 +62757,14 @@ /turf/open/floor/plating, /area/station/maintenance/aft/upper) "lYi" = ( -/obj/effect/turf_decal/stripes{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, /obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/medical/power_station) +/obj/structure/table/reinforced, +/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun, +/obj/item/mecha_parts/mecha_equipment/medical/sleeper, +/obj/item/storage/box/syringes, +/turf/open/floor/iron, +/area/station/command/heads_quarters/cmo) "lYj" = ( /obj/effect/turf_decal/siding/dark{ dir = 8 @@ -63106,12 +62962,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/science/explab) -"map" = ( -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/turf/closed/wall, -/area/station/security/power_station) "maq" = ( /obj/machinery/newscaster/directional/north, /obj/structure/disposalpipe/segment{ @@ -64315,11 +64165,6 @@ }, /turf/open/floor/iron, /area/station/science/xenobiology) -"mne" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/service/power_station) "mng" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/bot, @@ -64662,7 +64507,7 @@ icon_state = "dirt-flat-1" }, /turf/open/floor/iron/dark, -/area/station/science/power_station) +/area/station/maintenance/aft/upper) "mrb" = ( /obj/structure/table/reinforced, /obj/machinery/recharger{ @@ -67390,8 +67235,12 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "mSG" = ( -/turf/closed/wall/rust, -/area/station/science/power_station) +/obj/machinery/door/airlock/cmo{ + name = "Chief Medical Officer's Quarters" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, +/turf/open/floor/wood/parquet, +/area/station/command/heads_quarters/cmo) "mSI" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -68364,7 +68213,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/security/power_station) +/area/station/maintenance/port/fore) "ncB" = ( /obj/effect/spawner/random/trash/mess, /obj/structure/disposalpipe/segment{ @@ -68372,12 +68221,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/wrestle) -"ncC" = ( -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/turf/closed/wall/rust, -/area/station/medical/power_station) "ncD" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -69769,8 +69612,9 @@ /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" }, -/turf/open/floor/iron/dark, -/area/station/medical/power_station) +/obj/vehicle/sealed/mecha/odysseus, +/turf/open/floor/iron/recharge_floor, +/area/station/command/heads_quarters/cmo) "nrY" = ( /obj/effect/turf_decal/stripes{ dir = 4 @@ -69840,7 +69684,7 @@ "nsz" = ( /obj/machinery/power/port_gen/pacman/pre_loaded, /turf/open/floor/plating, -/area/station/service/power_station) +/area/station/maintenance/starboard/fore) "nsA" = ( /obj/structure/chair/office{ dir = 1 @@ -71050,15 +70894,10 @@ /turf/open/floor/grass, /area/station/command/heads_quarters/cmo) "nEh" = ( -/obj/machinery/power/terminal{ - dir = 8 - }, /obj/structure/cable, -/obj/effect/turf_decal/stripes{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/medical/power_station) +/obj/machinery/chem_heater/withbuffer, +/turf/open/floor/iron, +/area/station/command/heads_quarters/cmo) "nEk" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/reagent_containers/cup/bucket, @@ -71414,9 +71253,6 @@ /obj/machinery/holopad/secure, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) -"nHC" = ( -/turf/closed/wall, -/area/station/medical/power_station) "nHR" = ( /obj/structure/cable, /turf/open/floor/wood, @@ -71982,14 +71818,17 @@ /turf/open/space/openspace, /area/space/nearstation) "nNl" = ( -/obj/machinery/door/airlock/engineering{ - name = "Medical Power Station" - }, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/any/medical/cmo, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, -/turf/open/floor/iron/dark, -/area/station/medical/power_station) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Chief Medical Officer Office Maintenance" + }, +/obj/effect/decal/cleanable/dirt{ + icon_state = "dirt-flat-1" + }, +/turf/open/floor/plating, +/area/station/command/heads_quarters/cmo) "nNn" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -72236,7 +72075,7 @@ icon_state = "dirt-flat-1" }, /turf/open/floor/iron/dark, -/area/station/science/power_station) +/area/station/maintenance/aft/upper) "nQf" = ( /obj/machinery/airalarm/directional/west, /obj/item/radio/intercom/directional/south, @@ -73972,7 +73811,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/station/service/power_station) +/area/station/maintenance/starboard/fore) "ogj" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, @@ -74397,11 +74236,6 @@ /obj/item/circuitboard/machine/chem_dispenser/mutagensaltpeter, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"ojp" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/service/power_station) "ojs" = ( /obj/structure/table/wood, /obj/item/modular_computer/laptop/preset/civilian, @@ -75589,18 +75423,11 @@ /turf/open/floor/wood, /area/station/security/courtroom) "ouh" = ( -/obj/machinery/power/terminal{ - dir = 8 - }, /obj/structure/cable, -/obj/effect/turf_decal/stripes{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/turf/open/floor/iron/dark, -/area/station/medical/power_station) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/command/heads_quarters/cmo) "oun" = ( /obj/machinery/door/firedoor, /obj/machinery/light/directional/north, @@ -77547,15 +77374,9 @@ icon_state = "dirt-flat-1" }, /obj/effect/mapping_helpers/broken_floor, -/obj/machinery/power/terminal{ - dir = 4 - }, /obj/structure/cable, -/obj/effect/turf_decal/stripes{ - dir = 4 - }, /turf/open/floor/plating, -/area/station/service/power_station) +/area/station/maintenance/starboard/fore) "oNI" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -77941,10 +77762,9 @@ /turf/open/floor/wood, /area/station/medical/psychology) "oRy" = ( -/obj/machinery/computer/monitor, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/security/power_station) +/area/station/maintenance/port/fore) "oRP" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -78184,15 +78004,9 @@ /turf/open/floor/grass, /area/station/security/prison/garden) "oUt" = ( -/obj/machinery/power/terminal{ - dir = 4 - }, /obj/structure/cable, -/obj/effect/turf_decal/stripes{ - dir = 4 - }, /turf/open/floor/iron/dark, -/area/station/service/power_station) +/area/station/maintenance/starboard/fore) "oUy" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -79070,11 +78884,9 @@ icon_state = "dirt-flat-1" }, /obj/structure/cable, -/obj/machinery/computer/monitor{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/medical/power_station) +/obj/machinery/mech_bay_recharge_port, +/turf/open/floor/iron, +/area/station/command/heads_quarters/cmo) "pdF" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -79553,18 +79365,10 @@ /area/station/medical/surgery) "piy" = ( /obj/machinery/light/small/directional/north, -/obj/machinery/power/terminal{ - dir = 8 - }, /obj/structure/cable, -/obj/effect/turf_decal/stripes{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/turf/open/floor/iron/dark, -/area/station/medical/power_station) +/obj/machinery/chem_dispenser, +/turf/open/floor/iron, +/area/station/command/heads_quarters/cmo) "piD" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/structure/cable, @@ -83522,7 +83326,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/science/power_station) +/area/station/maintenance/aft/upper) "pWA" = ( /obj/structure/table, /obj/item/wirecutters/makeshift, @@ -84315,9 +84119,6 @@ dir = 8 }, /area/station/hallway/primary/port) -"qem" = ( -/turf/closed/wall/rust, -/area/station/medical/power_station) "qet" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, @@ -86329,7 +86130,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/security/power_station) +/area/station/maintenance/port/fore) "qwm" = ( /turf/open/floor/plating, /area/station/maintenance/department/medical) @@ -86704,11 +86505,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/science/central) -"qzO" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/service/power_station) "qzQ" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/rack, @@ -91548,10 +91344,16 @@ /turf/open/floor/iron/white/textured, /area/station/medical/aslyum) "ruS" = ( -/obj/machinery/power/smes, /obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/science/power_station) +/obj/structure/rack/gunrack, +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg, +/obj/item/mecha_parts/mecha_equipment/rcd, +/obj/item/mecha_ammo/lmg, +/obj/item/mecha_ammo/lmg, +/obj/item/mecha_ammo/lmg, +/obj/item/mecha_ammo/lmg, +/turf/open/floor/iron, +/area/station/ai_monitored/security/armory) "ruT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -93283,16 +93085,12 @@ }, /area/station/medical/medbay/lobby) "rNe" = ( -/obj/machinery/door/airlock/engineering{ - name = "Science Power Station" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/any/science/rd, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, -/area/station/science/power_station) +/area/station/maintenance/aft/upper) "rNl" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -95175,7 +94973,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/security/power_station) +/area/station/maintenance/port/fore) "sgD" = ( /obj/effect/turf_decal/siding/thinplating_new{ dir = 1 @@ -96071,7 +95869,7 @@ /obj/effect/turf_decal/stripes/box, /obj/effect/turf_decal/stripes/red/box, /obj/structure/sign/poster/official/carwo_grenade/directional/north, -/obj/structure/mecha_wreckage/gygax, +/obj/vehicle/sealed/mecha/gygax, /turf/open/floor/iron/recharge_floor, /area/station/ai_monitored/security/armory) "sqo" = ( @@ -107933,14 +107731,13 @@ /turf/open/floor/plating, /area/station/maintenance/solars/starboard/aft) "uBS" = ( -/obj/machinery/power/terminal, /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes, /turf/open/floor/iron/dark, -/area/station/science/power_station) +/area/station/maintenance/aft/upper) "uBT" = ( /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 4 @@ -107958,7 +107755,7 @@ /area/station/maintenance/aft/upper) "uCg" = ( /turf/open/floor/iron/dark, -/area/station/security/power_station) +/area/station/maintenance/port/fore) "uCj" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -107969,19 +107766,13 @@ /turf/open/floor/iron, /area/station/construction/mining/aux_base) "uCl" = ( -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, /obj/effect/mapping_helpers/broken_floor, -/obj/machinery/power/terminal{ - dir = 4 - }, /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/open/floor/iron/dark, -/area/station/security/power_station) +/area/station/maintenance/port/fore) "uCp" = ( /obj/effect/turf_decal/stripes/box, /obj/effect/turf_decal/stripes/red/box, @@ -110156,15 +109947,12 @@ /turf/open/floor/plating, /area/station/maintenance/port/upper) "uYI" = ( -/obj/machinery/power/terminal{ - dir = 4 - }, /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/open/floor/iron/dark, -/area/station/security/power_station) +/area/station/maintenance/port/fore) "uYL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -113074,14 +112862,16 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, -/obj/structure/rack, /obj/machinery/camera/directional/south{ c_tag = "Medical - Power Station"; name = "engineering camera"; network = list("ss13","ce") }, -/turf/open/floor/iron/dark, -/area/station/medical/power_station) +/obj/machinery/computer/mech_bay_power_console{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/cmo) "vzT" = ( /obj/structure/mirror{ pixel_y = 32 @@ -113700,7 +113490,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/station/security/power_station) +/area/station/maintenance/port/fore) "vHe" = ( /obj/structure/table, /obj/item/reagent_containers/cup/glass/drinkingglass{ @@ -119390,19 +119180,10 @@ /turf/open/floor/carpet/royalblack, /area/station/command/heads_quarters/qm) "wJa" = ( -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/obj/machinery/power/terminal{ - dir = 4 - }, /obj/structure/cable, -/obj/effect/turf_decal/stripes{ - dir = 4 - }, /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, -/area/station/service/power_station) +/area/station/maintenance/starboard/fore) "wJd" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/bot, @@ -119458,10 +119239,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/science/research) -"wJl" = ( -/obj/effect/spawner/random/trash/graffiti, -/turf/closed/wall, -/area/station/service/power_station) "wJr" = ( /obj/item/stack/sheet/cardboard, /obj/structure/cable, @@ -121701,9 +121478,6 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"xgI" = ( -/turf/closed/wall, -/area/station/science/power_station) "xgN" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -123363,13 +123137,12 @@ /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" }, -/obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/security/power_station) +/area/station/maintenance/port/fore) "xxp" = ( /turf/closed/wall/rust, /area/station/maintenance/library/lower) @@ -123729,17 +123502,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/pool_maintenance) -"xBK" = ( -/obj/machinery/door/airlock/engineering{ - name = "Medical Power Station" - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/any/medical/cmo, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/medical/power_station) "xBL" = ( /obj/effect/spawner/structure/window, /obj/structure/curtain/cloth/fancy/mechanical{ @@ -127179,7 +126941,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, -/area/station/security/power_station) +/area/station/maintenance/port/fore) "yiI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -148895,12 +148657,12 @@ mjG fVV mjG ojX -map -aXM -aXM -aXM -aXM -aXM +nqO +rKn +rKn +rKn +rKn +rKn laf laf uMr @@ -149151,11 +148913,11 @@ mjE mjE mjE mjE -bbm -aXM +tNz +rKn ltX uCg -fpW +oRy jhT kAe laf @@ -149408,13 +149170,13 @@ hce sAN euE gKk -bbm +tNz dfX uCl uYI uYI hqR -aXM +rKn ttc tPT rKn @@ -149665,13 +149427,13 @@ euE sAN euE euE -bbm +tNz jVT -cBY -acB -gFE +igP +oRy +igP jQD -aXM +rKn kbf tPT rKn @@ -149922,13 +149684,13 @@ iHC mQE iHC pYt -bbm +tNz bmN nct aeP sgz qwg -aXM +rKn kbf rKn rKn @@ -150179,7 +149941,7 @@ euE sAN euE iHC -bbm +tNz oRy igP xxn @@ -150436,13 +150198,13 @@ cgu sAN euE iHC -bbm -bbm -bbm -bbm -bbm -bbm -aXM +tNz +tNz +tNz +tNz +tNz +tNz +rKn ctM mWp lqH @@ -159955,7 +159717,7 @@ oFP iXV gkm kAc -rNT +ruS iem faI vgD @@ -163568,11 +163330,11 @@ fBz fBz fBz ltC -jte -jte -lnJ -jte -jte +dVy +dVy +mrV +dVy +dVy ygn ugS oNI @@ -163828,8 +163590,8 @@ iwe ogh ixJ nsz -ojp -jte +fqP +dVy sfS mrV hOE @@ -164084,9 +163846,9 @@ fBz wJa oNH oUt -dWg +tVI bSB -lnJ +mrV ygn fwA rpO @@ -164338,12 +164100,12 @@ kas qwc ltK fBz -mne -qzO -qzO +fqP +oUt +oUt bxx -bzC -lnJ +oUt +mrV xhw xhw rpJ @@ -164598,7 +164360,7 @@ fBz jId erj cHP -bOO +iGb aVm kub iGb @@ -164852,12 +164614,12 @@ ePN nCO joM fBz -jte -wJl -jte -lnJ -jte -jte +dVy +uyp +dVy +mrV +dVy +dVy bJg mrV hxZ @@ -216076,11 +215838,11 @@ pzS pzS pzS tfJ -xgI -xgI -xgI -xgI -mSG +tcq +tcq +tcq +tcq +lbA lEo lec khL @@ -216333,11 +216095,11 @@ bdS fLw pzS tfJ -mSG +lbA emg uBS gOx -mSG +lbA qho aDV anF @@ -216594,7 +216356,7 @@ rNe lQt kHP gOx -xgI +tcq qho jLp awA @@ -216847,11 +216609,11 @@ pzS pzS pzS oVN -xgI -xgI +tcq +tcq jgq -ruS -xgI +gOx +tcq qFl aDV gwl @@ -217105,10 +216867,10 @@ lNg rfn qbG tpk -xgI +tcq ekG pWy -xgI +tcq sXD pFq thw @@ -217362,10 +217124,10 @@ pzS pzS pzS wnO -xgI -lpQ +tcq +gOx nPY -xgI +tcq dFP pFq maI @@ -217619,10 +217381,10 @@ sca dXM pzS uqF -xgI +tcq dvv mqY -mSG +lbA tpk ujy bqu @@ -217876,10 +217638,10 @@ uJA aOH pzS cDm -xgI -xgI +tcq +tcq iBd -xgI +tcq lbA pFq vVn @@ -235070,7 +234832,7 @@ bcQ bcQ bcQ bcQ -bcQ +mSG bcQ bcQ kPf @@ -235329,8 +235091,8 @@ lge lYi iGu pdD -ncC -hGT +dKH +vTD wDa psl psl @@ -235581,12 +235343,12 @@ lOi dxn tkQ bcQ -gQa -gQa +hFX +hFX hFX cFK nrV -xBK +bcQ kPf fOk eDm @@ -235843,7 +235605,7 @@ nEh ouh gnt vzQ -nHC +bcQ klc wYQ wZd @@ -236094,13 +235856,13 @@ cLR qwm tSM wUw -psl -nHC -qem +bcQ +bcQ +bcQ nNl -qem +bcQ dKH -qem +bcQ asK ajh kgc @@ -236354,7 +236116,7 @@ oOX tkG nfF hOT -vVB +vTD uBi pYb psl diff --git a/code/__DEFINES/melee.dm b/code/__DEFINES/melee.dm index 7544b0176dc..55240946de0 100644 --- a/code/__DEFINES/melee.dm +++ b/code/__DEFINES/melee.dm @@ -1,8 +1,9 @@ //Martial arts defines #define MARTIALART_BOXING "boxing" -#define MARTIALART_EVIL_BOXING "evil boxing" #define MARTIALART_CQC "CQC" +#define MARTIALART_EVIL_BOXING "evil boxing" +#define MARTIALART_HUNTER_BOXING "hunter boxing" #define MARTIALART_KRAVMAGA "krav maga" #define MARTIALART_MUSHPUNCH "mushroom punch" #define MARTIALART_PLASMAFIST "plasma fist" diff --git a/code/__DEFINES/~skyrat_defines/traits/declarations.dm b/code/__DEFINES/~skyrat_defines/traits/declarations.dm index 41958b3c3c2..073ada366b7 100644 --- a/code/__DEFINES/~skyrat_defines/traits/declarations.dm +++ b/code/__DEFINES/~skyrat_defines/traits/declarations.dm @@ -62,7 +62,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_ELECTRICAL_DAMAGE_REPAIRING "electrical_damage_repairing" // felinid traits -#define TRAIT_FELINE "feline_aspect" +#define TRAIT_FELINID "felinid_aspect" // canine traits #define TRAIT_CANINE "canine_aspect" diff --git a/code/__HELPERS/~skyrat_helpers/is_helpers.dm b/code/__HELPERS/~skyrat_helpers/is_helpers.dm index 6cc72ba9074..319394fbc7f 100644 --- a/code/__HELPERS/~skyrat_helpers/is_helpers.dm +++ b/code/__HELPERS/~skyrat_helpers/is_helpers.dm @@ -28,7 +28,7 @@ #define ishumanoid(A) (is_species(A,/datum/species/humanoid)) #define ismammal(A) (is_species(A,/datum/species/mammal)) #define isinsect(A) (is_species(A,/datum/species/insect)) -#define isfeline(A) (isfelinid(A) || istajaran(A) || HAS_TRAIT(A, TRAIT_FELINE)) +#define isfeline(A) (isfelinid(A) || istajaran(A) || HAS_TRAIT(A, TRAIT_FELINID)) #define iscanine(A) (isvulpkanin(A) || HAS_TRAIT(A, TRAIT_CANINE)) #define isavian(A) (isteshari(A) || isvox(A) || isvoxprimalis(A) || HAS_TRAIT(A, TRAIT_AVIAN)) diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm index 6318ee02488..12e62bdc30b 100644 --- a/code/_globalvars/traits/_traits.dm +++ b/code/_globalvars/traits/_traits.dm @@ -688,7 +688,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_DETECTIVE" = TRAIT_DETECTIVE, "TRAIT_DNR" = TRAIT_DNR, "TRAIT_EXCITABLE" = TRAIT_EXCITABLE, - "TRAIT_FELINE" = TRAIT_FELINE, + "TRAIT_FELINID" = TRAIT_FELINID, "TRAIT_FLORAL_ASPECT" = TRAIT_FLORAL_ASPECT, "TRAIT_FREE_GHOST" = TRAIT_FREE_GHOST, "TRAIT_GHOSTROLE" = TRAIT_GHOSTROLE, diff --git a/code/_globalvars/traits/admin_tooling.dm b/code/_globalvars/traits/admin_tooling.dm index 4b83adaa181..2781f96c46e 100644 --- a/code/_globalvars/traits/admin_tooling.dm +++ b/code/_globalvars/traits/admin_tooling.dm @@ -373,7 +373,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list( "TRAIT_DETECTIVE" = TRAIT_DETECTIVE, "TRAIT_DNR" = TRAIT_DNR, "TRAIT_EXCITABLE" = TRAIT_EXCITABLE, - "TRAIT_FELINE" = TRAIT_FELINE, + "TRAIT_FELINID" = TRAIT_FELINID, "TRAIT_FLORAL_ASPECT" = TRAIT_FLORAL_ASPECT, "TRAIT_FREE_GHOST" = TRAIT_FREE_GHOST, "TRAIT_GHOSTROLE" = TRAIT_GHOSTROLE, diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index 729bd92a125..305eb0a9062 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -32,7 +32,7 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list( list(/datum/quirk/no_guns, /datum/quirk/bighands, /datum/quirk/poor_aim), list(/datum/quirk/no_guns, /datum/quirk/nonviolent), list(/datum/quirk/spacer_born, /datum/quirk/oversized), - list(/datum/quirk/feline_aspect, /datum/quirk/item_quirk/canine, /datum/quirk/item_quirk/avian), + list(/datum/quirk/felinid_aspect, /datum/quirk/item_quirk/canine, /datum/quirk/item_quirk/avian), list(/datum/quirk/all_nighter, /datum/quirk/heavy_sleeper), list(/datum/quirk/light_drinker, /datum/quirk/drunkhealing), list(/datum/quirk/oversized, /datum/quirk/freerunning), diff --git a/code/datums/martial/boxing.dm b/code/datums/martial/boxing.dm index 5c24aaf45b7..3465fe300a5 100644 --- a/code/datums/martial/boxing.dm +++ b/code/datums/martial/boxing.dm @@ -7,8 +7,10 @@ name = "Boxing" id = MARTIALART_BOXING pacifist_style = TRUE - ///Boolean on whether we are sportsmanlike in our tussling; TRUE means we have restrictions + /// Boolean on whether we are sportsmanlike in our tussling; TRUE means we have restrictions var/honorable_boxer = TRUE + /// Default damage type for our boxing. + var/default_damage_type = STAMINA /// List of traits applied to users of this martial art. var/list/boxing_traits = list(TRAIT_BOXING_READY) /// Balloon alert cooldown for warning our boxer to alternate their blows to get more damage @@ -40,10 +42,16 @@ if(findtext(streak, LEFT_RIGHT_COMBO) || findtext(streak, RIGHT_LEFT_COMBO)) reset_streak() + // If we have an extra effect from the combo, perform it here. By default, we have no extra effect. + perform_extra_effect(attacker, defender) return combo_multiplier * 1.5 return combo_multiplier +/// An extra effect on some moves and attacks. +/datum/martial_art/boxing/proc/perform_extra_effect(mob/living/attacker, mob/living/defender) + return + /datum/martial_art/boxing/disarm_act(mob/living/attacker, mob/living/defender) if(honor_check(defender)) add_to_streak("D", defender) @@ -88,8 +96,8 @@ // If true, grants experience for punching; we only gain experience if we punch another boxer. var/grant_experience = FALSE - // What type of damage does our kind of boxing do? Defaults to STAMINA, unless you're performing EVIL BOXING - var/damage_type = honorable_boxer ? STAMINA : attacker.get_attack_type() + // What type of damage does our kind of boxing do? Defaults to STAMINA for normal boxing, unless you're performing EVIL BOXING. Subtypes use different damage types. + var/damage_type = honorable_boxer ? default_damage_type : attacker.get_attack_type() attacker.do_attack_animation(defender, ATTACK_EFFECT_PUNCH) @@ -147,12 +155,12 @@ log_combat(attacker, defender, "punched (boxing) ") + if(defender.stat == DEAD || !honor_check(defender)) //early returning here so we don't worry about knockout probs or experience gain + return TRUE + if(grant_experience) skill_experience_adjustment(attacker, (damage/lower_force)) - if(defender.stat == DEAD || !honor_check(defender)) //early returning here so we don't worry about knockout probs - return TRUE - //Determine our attackers athletics level as a knockout probability bonus var/attacker_athletics_skill = (attacker.mind?.get_skill_modifier(/datum/skill/athletics, SKILL_RANDS_MODIFIER) + base_unarmed_effectiveness) @@ -165,6 +173,18 @@ if(!prob(final_knockout_probability)) return TRUE + crit_effect(attacker, defender, armor_block, damage_type, damage) + + experience_earned *= 2 //Double our experience gain on a crit hit + + playsound(defender, 'sound/effects/coin2.ogg', 40, TRUE) + new /obj/effect/temp_visual/crit(get_turf(defender)) + skill_experience_adjustment(attacker, experience_earned) //double experience for a successful crit + + return TRUE + +/// Our crit effect. For normal boxing, this applies a stagger, then applies a knockout if they're staggered. Other types of boxing apply different kinds of effects. +/datum/martial_art/boxing/proc/crit_effect(mob/living/attacker, mob/living/defender, armor_block = 0, damage_type = STAMINA, damage = 0) if(defender.get_timed_status_effect_duration(/datum/status_effect/staggered)) defender.visible_message( span_danger("[attacker] knocks [defender] out with a haymaker!"), @@ -189,14 +209,6 @@ to_chat(attacker, span_danger("You stagger [defender] with a haymaker!")) log_combat(attacker, defender, "staggered (boxing) ") - experience_earned *= 2 //Double our experience gain on a crit hit - - playsound(defender, 'sound/effects/coin2.ogg', 40, TRUE) - new /obj/effect/temp_visual/crit(get_turf(defender)) - skill_experience_adjustment(attacker, experience_earned) //double experience for a successful crit - - return TRUE - /// Returns whether whoever is checked by this proc is complying with the rules of boxing. The boxer cannot block non-boxers, and cannot apply their scariest moves against non-boxers. /datum/martial_art/boxing/proc/honor_check(mob/living/possible_boxer) if(!honorable_boxer) @@ -254,8 +266,9 @@ return NONE if(istype(attacker) && boxer.Adjacent(attacker)) - attacker.apply_damage(10, STAMINA) + attacker.apply_damage(10, default_damage_type) boxer.apply_damage(5, STAMINA) + perform_extra_effect(boxer, attacker) boxer.visible_message( span_danger("[boxer] [block_text]s [attack_text]!"), @@ -271,6 +284,8 @@ return FALSE return ..() +// Boxing Variants! + /// Evil Boxing; for sick, evil scoundrels. Has no honor, making it more lethal (therefore unable to be used by pacifists). /// Grants Strength and Stimmed to speed up any experience gain. @@ -281,6 +296,68 @@ honorable_boxer = FALSE boxing_traits = list(TRAIT_BOXING_READY, TRAIT_STRENGTH, TRAIT_STIMMED) +/// Hunter Boxing: for the uncaring, completely deranged one-spacer ecological disaster. +/// The honor check accepts boxing ready targets, OR various biotypes as valid targets. Uses a special crit effect rather than the standard one (against monsters). +/// I guess technically, this allows for lethal boxing. If you want. +/datum/martial_art/boxing/hunter + name = "Hunter Boxing" + id = MARTIALART_HUNTER_BOXING + pacifist_style = FALSE + default_damage_type = BRUTE + boxing_traits = list(TRAIT_BOXING_READY) + /// The mobs we are looking for to pass the honor check + var/honorable_mob_biotypes = MOB_BEAST | MOB_SPECIAL | MOB_PLANT | MOB_BUG + /// Our crit shout words. First word is then paired with a second word to form an attack name. + var/list/first_word_strike = list("Extinction", "Brutalization", "Explosion", "Adventure", "Thunder", "Lightning", "Sonic", "Atomizing", "Whirlwind", "Tornado", "Shark", "Falcon") + var/list/second_word_strike = list(" Punch", " Pawnch", "-punch", " Jab", " Hook", " Fist", " Uppercut", " Straight", " Strike", " Lunge") + +/datum/martial_art/boxing/hunter/honor_check(mob/living/possible_boxer) + if(HAS_TRAIT(possible_boxer, TRAIT_BOXING_READY)) + return TRUE + + if(possible_boxer.mob_biotypes & MOB_HUMANOID && !istype(possible_boxer, /mob/living/simple_animal/hostile/megafauna)) //We're after animals, not people. Unless they want to box. (Or a megafauna) + return FALSE + + if(possible_boxer.mob_biotypes & honorable_mob_biotypes) //We're after animals, not people + return TRUE + + return FALSE //rather than default assume TRUE, we default assume FALSE. After all, there could be mobs that are none of our biotypes and also not humanoid. By default, they would be valid for being boxed if TRUE. + +// Our hunter boxer applies a rebuke and double damage against the target of their crit. If the target is humanoid, we just perform our regular crit effect instead. + +/datum/martial_art/boxing/hunter/crit_effect(mob/living/attacker, mob/living/defender, armor_block = 0, damage_type = STAMINA, damage = 0) + if(defender.mob_biotypes & MOB_HUMANOID && !istype(defender, /mob/living/simple_animal/hostile/megafauna)) + return ..() //Applies the regular crit effect if it is a normal human, and not a megafauna + + var/first_word_pick = pick(first_word_strike) + var/second_word_pick = pick(second_word_strike) + + defender.visible_message( + span_danger("[attacker] knocks the absolute bajeezus out of [defender] utilizing the terrifying [first_word_pick][second_word_pick]!!!"), + span_userdanger("You have the absolute bajeezus knocked out of you by [attacker]!!!"), + span_hear("You hear a sickening sound of flesh hitting flesh!"), + COMBAT_MESSAGE_RANGE, + attacker, + ) + to_chat(attacker, span_danger("You knock the absolute bajeezus out of [defender] out with the terrifying [first_word_pick][second_word_pick]!!!")) + if(ishuman(attacker)) + var/mob/living/carbon/human/human_attacker = attacker + human_attacker.force_say() + human_attacker.say("[first_word_pick][second_word_pick]!!!", forced = "hunter boxing enthusiastic battlecry") + defender.apply_status_effect(/datum/status_effect/rebuked) + defender.apply_damage(damage * 2, default_damage_type, BODY_ZONE_CHEST, armor_block) //deals double our damage AGAIN + attacker.reagents.add_reagent(/datum/reagent/medicine/omnizine/godblood, 3) //Get a little healing in return for a successful crit + log_combat(attacker, defender, "hunter crit punched (boxing)") + +// Our hunter boxer speeds up their attacks when completing a combo against a valid target, and does a sizable amount of extra damage. + +/datum/martial_art/boxing/hunter/perform_extra_effect(mob/living/attacker, mob/living/defender) + if(defender.mob_biotypes & MOB_HUMANOID && !istype(defender, /mob/living/simple_animal/hostile/megafauna)) + return // Does not apply to humans (who aren't megafauna) + + attacker.changeNext_move(CLICK_CD_RAPID) + defender.apply_damage(rand(15,20), default_damage_type, BODY_ZONE_CHEST) + #undef LEFT_RIGHT_COMBO #undef RIGHT_LEFT_COMBO #undef LEFT_LEFT_COMBO diff --git a/code/game/objects/items/food/cake.dm b/code/game/objects/items/food/cake.dm index 3bcb35376ab..ec3e0a0390c 100644 --- a/code/game/objects/items/food/cake.dm +++ b/code/game/objects/items/food/cake.dm @@ -45,6 +45,10 @@ foodtypes = GRAIN | DAIRY | SUGAR slice_type = /obj/item/food/cakeslice/plain +/obj/item/food/cake/plain/Initialize(mapload) + . = ..() + AddComponent(/datum/component/customizable_reagent_holder, /obj/item/food/cake/empty, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 16) + /obj/item/food/cakeslice/plain name = "plain cake slice" desc = "Just a slice of cake, it is enough for everyone." @@ -52,6 +56,23 @@ tastes = list("sweetness" = 2, "cake" = 5) foodtypes = GRAIN | DAIRY | SUGAR +/obj/item/food/cake/empty + name = "cake" + desc = "A custom cake made by an insane chef." + icon_state = "cake_custom" + foodtypes = GRAIN | DAIRY | SUGAR + slice_type = /obj/item/food/cakeslice/empty + +/obj/item/food/cakeslice/empty + name = "cake slice" + desc = "A slice of custom cake, made by an insane chef." + icon_state = "cake_custom_slice" + foodtypes = GRAIN | DAIRY | SUGAR + +/obj/item/food/cakeslice/empty/Initialize(mapload) + . = ..() + AddComponent(/datum/component/customizable_reagent_holder, null, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 16) + /obj/item/food/cake/carrot name = "carrot cake" desc = "A favorite desert of a certain wascally wabbit. Not a lie." diff --git a/code/game/objects/items/food/pie.dm b/code/game/objects/items/food/pie.dm index 4a44f5e5cb6..b232be29ba8 100644 --- a/code/game/objects/items/food/pie.dm +++ b/code/game/objects/items/food/pie.dm @@ -39,6 +39,27 @@ foodtypes = GRAIN crafting_complexity = FOOD_COMPLEXITY_2 +/obj/item/food/pie/plain/Initialize(mapload) + . = ..() + AddComponent(/datum/component/customizable_reagent_holder, /obj/item/food/pie/empty, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 8) + +/obj/item/food/pie/empty + name = "pie" + desc = "A custom pie made by a crazed chef." + icon_state = "pie_custom" + foodtypes = GRAIN + slice_type = /obj/item/food/pieslice/empty + +/obj/item/food/pieslice/empty + name = "pie slice" + desc = "A custom pie slice made by a crazed chef." + icon_state = "pie_custom_slice" + foodtypes = GRAIN + +/obj/item/food/pieslice/empty/Initialize(mapload) + . = ..() + AddComponent(/datum/component/customizable_reagent_holder, null, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 8) + /obj/item/food/pie/cream name = "banana cream pie" desc = "Just like back home, on clown planet! HONK!" diff --git a/code/game/objects/structures/icemoon/cave_entrance.dm b/code/game/objects/structures/icemoon/cave_entrance.dm index 4401b87d23e..6efa6718759 100644 --- a/code/game/objects/structures/icemoon/cave_entrance.dm +++ b/code/game/objects/structures/icemoon/cave_entrance.dm @@ -178,7 +178,8 @@ GLOBAL_LIST_INIT(ore_probability, list( if(16) new /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/doom(loc) if(17) - new /obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola(loc) + new /obj/item/clothing/gloves/fingerless/punch_mitts(loc) + new /obj/item/clothing/head/cowboy(loc) if(18) new /obj/item/soulstone/anybody(loc) if(19) diff --git a/code/modules/clothing/gloves/punch_mitts.dm b/code/modules/clothing/gloves/punch_mitts.dm new file mode 100644 index 00000000000..07d93d5ab02 --- /dev/null +++ b/code/modules/clothing/gloves/punch_mitts.dm @@ -0,0 +1,24 @@ +/obj/item/clothing/gloves/fingerless/punch_mitts + name = "punching mitts" + desc = "Fingerless gloves with nasty spikes attached. Allows the wearer to utilize the ill-reputed fighting technique known as Hunter Boxing. The style \ + allows the user to punch wildlife rapidly to death. Supposedly, this is an incredible workout, but few people are insane enough to attempt to \ + punch every dangerous creature they encounter in the wild to death with their bare hands. Also kinda works against humanoids as well. \ + Not that you would... right?" + icon_state = "punch_mitts" + body_parts_covered = HANDS|ARMS + resistance_flags = LAVA_PROOF | FIRE_PROOF + armor_type = /datum/armor/gloves_mitts + +/obj/item/clothing/gloves/fingerless/punch_mitts/Initialize(mapload) + . = ..() + + AddComponent(/datum/component/martial_art_giver, /datum/martial_art/boxing/hunter) + +/datum/armor/gloves_mitts + melee = 25 + bullet = 5 + laser = 5 + energy = 5 + bomb = 100 + fire = 100 + acid = 30 diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index aa29a1e6f4a..057107130d3 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -55,7 +55,7 @@ suit_store = /obj/item/gun/energy/e_gun //BUBBER EDIT - REVERTS SKYRAT REMOVAL backpack_contents = list( /obj/item/evidencebag = 1, - // /obj/item/storage/box/gunset/glock18_hos = 1, //SKYRAT EDIT ADDITION //BUBBER EDIT REMOVAL + /obj/item/choice_beacon/security_pistol = 1, //Skyrat Addition ) belt = /obj/item/modular_computer/pda/heads/hos ears = /obj/item/radio/headset/heads/hos/alt diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 0aa85af12d1..d90d65db405 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -18,7 +18,7 @@ /obj/structure/closet/crate/necropolis/tendril/attackby(obj/item/item, mob/user, params) if(!istype(item, /obj/item/skeleton_key) || spawned_loot) return ..() - var/loot = rand(1,20) + var/loot = rand(1,21) var/mod switch(loot) if(1) @@ -71,6 +71,9 @@ new /obj/item/bedsheet/cult(src) if(20) new /obj/item/clothing/neck/necklace/memento_mori(src) + if(21) + new /obj/item/clothing/gloves/fingerless/punch_mitts(src) + new /obj/item/clothing/head/cowboy(src) if(!contents.len) to_chat(user, span_warning("[src] makes a clunking sound as you try to open it. You feel compelled to let the gods know! (Please open an adminhelp and try again!)")) CRASH("Failed to generate loot. loot number: [loot][mod ? "subloot: [mod]" : null]") diff --git a/code/modules/mob/living/basic/lavaland/legion/legion.dm b/code/modules/mob/living/basic/lavaland/legion/legion.dm index 1abd916461b..12bf6555d97 100644 --- a/code/modules/mob/living/basic/lavaland/legion/legion.dm +++ b/code/modules/mob/living/basic/lavaland/legion/legion.dm @@ -10,7 +10,7 @@ icon_living = "legion" icon_dead = "legion" icon_gib = "syndicate_gib" - mob_biotypes = MOB_ORGANIC|MOB_HUMANOID + mob_biotypes = MOB_ORGANIC|MOB_SPECIAL|MOB_UNDEAD basic_mob_flags = DEL_ON_DEATH speed = 3 maxHealth = 75 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm index 16f4cbc9779..1d993b18c30 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm @@ -64,7 +64,7 @@ if(gps_name && true_spawn) AddComponent(/datum/component/gps, gps_name) ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT) - add_traits(list(TRAIT_NO_TELEPORT, TRAIT_MARTIAL_ARTS_IMMUNE), MEGAFAUNA_TRAIT) + add_traits(list(TRAIT_NO_TELEPORT), MEGAFAUNA_TRAIT) grant_actions_by_list(attack_action_types) /mob/living/simple_animal/hostile/megafauna/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm index 193545d9985..935ed7a7215 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm @@ -27,7 +27,7 @@ Difficulty: Medium icon_living = "miner" icon = 'icons/mob/simple/broadMobs.dmi' health_doll_icon = "miner" - mob_biotypes = MOB_ORGANIC|MOB_HUMANOID + mob_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_SPECIAL light_color = COLOR_LIGHT_GRAYISH_RED speak_emote = list("roars") speed = 3 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm index 2af3018bed3..448896e3700 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm @@ -18,7 +18,7 @@ Difficulty: Extremely Hard attack_verb_continuous = "pummels" attack_verb_simple = "pummels" attack_sound = 'sound/weapons/sonic_jackhammer.ogg' - mob_biotypes = MOB_ORGANIC|MOB_HUMANOID + mob_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_SPECIAL light_color = COLOR_LIGHT_GRAYISH_RED movement_type = GROUND weather_immunities = list(TRAIT_SNOWSTORM_IMMUNE) diff --git a/html/changelogs/AutoChangeLog-pr-29437.yml b/html/changelogs/AutoChangeLog-pr-29437.yml deleted file mode 100644 index 9a6244cf7fd..00000000000 --- a/html/changelogs/AutoChangeLog-pr-29437.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "Fixes lobby buttons from station traits having no name and being unexaminable." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29466.yml b/html/changelogs/AutoChangeLog-pr-29466.yml deleted file mode 100644 index 091fb7b3f36..00000000000 --- a/html/changelogs/AutoChangeLog-pr-29466.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "Fixed soapbox component sometimes runtiming roundstart" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29497.yml b/html/changelogs/AutoChangeLog-pr-29497.yml deleted file mode 100644 index 47ff5bb22ff..00000000000 --- a/html/changelogs/AutoChangeLog-pr-29497.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Odairu" -delete-after: True -changes: - - rscadd: "asset protection modsuit and gives it to the AP ert" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29500.yml b/html/changelogs/AutoChangeLog-pr-29500.yml deleted file mode 100644 index 715e45a38de..00000000000 --- a/html/changelogs/AutoChangeLog-pr-29500.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "by Xackii, sprites by ArcaneMusic" -delete-after: True -changes: - - rscadd: "Added big manipulators." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29503.yml b/html/changelogs/AutoChangeLog-pr-29503.yml deleted file mode 100644 index 1d2806125a2..00000000000 --- a/html/changelogs/AutoChangeLog-pr-29503.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "Fixes kudzu being able to spawn on openspace turfs resulting in it getting stuck" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29505.yml b/html/changelogs/AutoChangeLog-pr-29505.yml deleted file mode 100644 index d8fb5aeeaba..00000000000 --- a/html/changelogs/AutoChangeLog-pr-29505.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "fences will no longer appear pitch black and they will layer properly" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29506.yml b/html/changelogs/AutoChangeLog-pr-29506.yml deleted file mode 100644 index 4bbf3451010..00000000000 --- a/html/changelogs/AutoChangeLog-pr-29506.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - qol: "Unarmed attacks with carp jaws now uses a bite effect rather than a punch effect." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29507.yml b/html/changelogs/AutoChangeLog-pr-29507.yml deleted file mode 100644 index 6711d9f19a9..00000000000 --- a/html/changelogs/AutoChangeLog-pr-29507.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "Radioactive nebula no longer runtimes on runtime station" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29508.yml b/html/changelogs/AutoChangeLog-pr-29508.yml deleted file mode 100644 index b61bcc897b3..00000000000 --- a/html/changelogs/AutoChangeLog-pr-29508.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Rhials" -delete-after: True -changes: - - qol: "Delivery/Bot pathing nodes have been added to the middle room of Runtime station." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29510.yml b/html/changelogs/AutoChangeLog-pr-29510.yml deleted file mode 100644 index 2be2bc46e19..00000000000 --- a/html/changelogs/AutoChangeLog-pr-29510.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - balance: "Pacifist carp can now be spawned from the friendly gold core reaction, and no longer appear from the hostile one." - - bugfix: "The teeth of toothless carp will not occasionally reappear" - - bugfix: "Crabs will now run from attackers larger than them and attack things smaller than them, as intended." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29511.yml b/html/changelogs/AutoChangeLog-pr-29511.yml deleted file mode 100644 index e659c0d66ed..00000000000 --- a/html/changelogs/AutoChangeLog-pr-29511.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - balance: "Changed max refined vortex cores from 1 to 3. Changed the Event Horizon Anti-Existential Beam Rifle recipe to require 2 vortex cores." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29512.yml b/html/changelogs/AutoChangeLog-pr-29512.yml deleted file mode 100644 index b354dfb17cb..00000000000 --- a/html/changelogs/AutoChangeLog-pr-29512.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - balance: "reticence requires progression" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29513.yml b/html/changelogs/AutoChangeLog-pr-29513.yml deleted file mode 100644 index bd76855666e..00000000000 --- a/html/changelogs/AutoChangeLog-pr-29513.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Rhials" -delete-after: True -changes: - - admin: "You can now choose the humanoid species spawned by an ERT summon in the summon menu." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29520.yml b/html/changelogs/AutoChangeLog-pr-29520.yml deleted file mode 100644 index b187005f50b..00000000000 --- a/html/changelogs/AutoChangeLog-pr-29520.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - balance: "The CytoPro has had prices raised to slightly more reasonable levels." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29524.yml b/html/changelogs/AutoChangeLog-pr-29524.yml deleted file mode 100644 index b8cbe7db271..00000000000 --- a/html/changelogs/AutoChangeLog-pr-29524.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "EspeciallyStrange" -delete-after: True -changes: - - rscadd: "Flatpacked machine to void raptor engineering and science" - - rscadd: "Breaching Missile for the paddy in void raptor" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-29530.yml b/html/changelogs/AutoChangeLog-pr-29530.yml deleted file mode 100644 index 869c028a303..00000000000 --- a/html/changelogs/AutoChangeLog-pr-29530.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Majkl-J" -delete-after: True -changes: - - bugfix: "Fixes the icon unit test" \ No newline at end of file diff --git a/html/changelogs/archive/2024-08.yml b/html/changelogs/archive/2024-08.yml index e38cc6f6280..587e1d5641c 100644 --- a/html/changelogs/archive/2024-08.yml +++ b/html/changelogs/archive/2024-08.yml @@ -700,3 +700,52 @@ plsleavemealon: - rscadd: Added several new options to the ration ticket quirk tailored specifically to ethereal players. +2024-08-23: + EspeciallyStrange: + - rscadd: Flatpacked machine to void raptor engineering and science + - rscadd: Breaching Missile for the paddy in void raptor + LT3: + - spellcheck: Feline Traits quirk renamed to Felinid Traits, to resolve confusion + what feline features get added + Majkl-J: + - bugfix: Fixes the icon unit test + Odairu: + - rscadd: asset protection modsuit and gives it to the AP ert + Rhials: + - admin: You can now choose the humanoid species spawned by an ERT summon in the + summon menu. + - qol: Delivery/Bot pathing nodes have been added to the middle room of Runtime + station. + SkyratBot: + - bugfix: fences will no longer appear pitch black and they will layer properly + - bugfix: Fixed soapbox component sometimes runtiming roundstart + - rscadd: Punching mitts! Punch wildlife to death and scream the whole time. ADVENTURE! + - balance: Megafauna can be affected by martial arts. + - bugfix: Fixes lobby buttons from station traits having no name and being unexaminable. + - image: Updated goliath cloak sprites + - balance: reticence requires progression + - bugfix: Fixes kudzu being able to spawn on openspace turfs resulting in it getting + stuck + - balance: Changed max refined vortex cores from 1 to 3. Changed the Event Horizon + Anti-Existential Beam Rifle recipe to require 2 vortex cores. + - balance: Pacifist carp can now be spawned from the friendly gold core reaction, + and no longer appear from the hostile one. + - bugfix: The teeth of toothless carp will not occasionally reappear + - bugfix: Crabs will now run from attackers larger than them and attack things smaller + than them, as intended. + - qol: Unarmed attacks with carp jaws now uses a bite effect rather than a punch + effect. + - bugfix: custom pies and cakes are craftable again + - balance: The CytoPro has had prices raised to slightly more reasonable levels. + - bugfix: Radioactive nebula no longer runtimes on runtime station + by Xackii, sprites by ArcaneMusic: + - rscadd: Added big manipulators. + nikothedude: + - balance: Naga constrict time needed reduced to 2.2 seconds + - bugfix: Science prescription glasses no longer give a medhud + - bugfix: AR prescription huds actually work now + projectkepler-ru: + - bugfix: the CMG should now actually be normal sized when folded + - bugfix: bein able to buy the MCR, please stop + - rscdel: obliterated powerstation from the blueshift. it should no longer be present + now diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi index b62b6a0a8ee..449be68d4e5 100644 Binary files a/icons/mob/clothing/hands.dmi and b/icons/mob/clothing/hands.dmi differ diff --git a/icons/mob/clothing/head/helmet.dmi b/icons/mob/clothing/head/helmet.dmi index 579f4c53f0f..c4e21d41799 100644 Binary files a/icons/mob/clothing/head/helmet.dmi and b/icons/mob/clothing/head/helmet.dmi differ diff --git a/icons/mob/clothing/suits/armor.dmi b/icons/mob/clothing/suits/armor.dmi index ea80204c2cd..9075a9047d4 100644 Binary files a/icons/mob/clothing/suits/armor.dmi and b/icons/mob/clothing/suits/armor.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index 4739498c164..a4549f9e74b 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/suits/armor.dmi b/icons/obj/clothing/suits/armor.dmi index b1763f5453f..25f14e0df93 100644 Binary files a/icons/obj/clothing/suits/armor.dmi and b/icons/obj/clothing/suits/armor.dmi differ diff --git a/icons/obj/food/piecake.dmi b/icons/obj/food/piecake.dmi index e6c0a71022d..1097c9d2acd 100644 Binary files a/icons/obj/food/piecake.dmi and b/icons/obj/food/piecake.dmi differ diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/glasses.dm b/modular_skyrat/master_files/code/modules/loadout/categories/glasses.dm index 0c104a252cb..67d15ed6e2c 100644 --- a/modular_skyrat/master_files/code/modules/loadout/categories/glasses.dm +++ b/modular_skyrat/master_files/code/modules/loadout/categories/glasses.dm @@ -155,7 +155,7 @@ /datum/loadout_item/glasses/science_glasses name = "Prescription Science glasses" - item_path = /obj/item/clothing/glasses/hud/science/prescription + item_path = /obj/item/clothing/glasses/science/prescription restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD) /datum/loadout_item/glasses/aviator_security diff --git a/modular_skyrat/modules/company_imports/code/armament_datums/allstar.dm b/modular_skyrat/modules/company_imports/code/armament_datums/allstar.dm index dbe6d24b35d..186c79e350d 100644 --- a/modular_skyrat/modules/company_imports/code/armament_datums/allstar.dm +++ b/modular_skyrat/modules/company_imports/code/armament_datums/allstar.dm @@ -27,6 +27,7 @@ /datum/armament_entry/company_import/allstar/basic_energy_long_weapons subcategory = "Basic Energy Longarms" + restricted = TRUE /datum/armament_entry/company_import/allstar/basic_energy_long_weapons/laser item_type = /obj/item/gun/energy/laser diff --git a/modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm b/modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm index 3d534e6d4af..658b5126939 100644 --- a/modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm +++ b/modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm @@ -196,11 +196,7 @@ /datum/armament_entry/company_import/deforest/equipment/loaded_belt_defib item_type = /obj/item/defibrillator/compact/loaded cost = PAYCHECK_COMMAND*2 -/* BUBBER EDIT START - OBVIOUSLY WE ARE NOT ADDING THIS -/datum/armament_entry/company_import/deforest/equipment/loaded_belt_defib2 - item_type = /obj/item/defibrillator/compact/combat/loaded/nanotrasen - cost = PAYCHECK_COMMAND*8 -BUBBER EDIT END*/ + /datum/armament_entry/company_import/deforest/equipment/surgical_tools item_type = /obj/item/surgery_tray/full cost = PAYCHECK_COMMAND diff --git a/modular_skyrat/modules/company_imports/code/armament_datums/micron_control_systems.dm b/modular_skyrat/modules/company_imports/code/armament_datums/micron_control_systems.dm index 261fac242a9..a174a73b523 100644 --- a/modular_skyrat/modules/company_imports/code/armament_datums/micron_control_systems.dm +++ b/modular_skyrat/modules/company_imports/code/armament_datums/micron_control_systems.dm @@ -9,7 +9,8 @@ /datum/armament_entry/company_import/micron/rifle/mcr item_type = /obj/item/gun/microfusion/mcr01 cost = PAYCHECK_COMMAND * 4 -*/ //BUBBER REMOVAL - No import guns + +*/ /datum/armament_entry/company_import/micron/ammo subcategory = ARMAMENT_SUBCATEGORY_AMMO diff --git a/modular_skyrat/modules/huds/code/designs.dm b/modular_skyrat/modules/huds/code/designs.dm index 631e0859c02..58b702e79e5 100644 --- a/modular_skyrat/modules/huds/code/designs.dm +++ b/modular_skyrat/modules/huds/code/designs.dm @@ -56,7 +56,7 @@ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 4, ) - build_path = /obj/item/clothing/glasses/hud/science/prescription + build_path = /obj/item/clothing/glasses/science/prescription category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE, ) diff --git a/modular_skyrat/modules/huds/code/glasses/HUD_Glasses.dm b/modular_skyrat/modules/huds/code/glasses/HUD_Glasses.dm index 5dd50c93ee8..40cdf3e1b6c 100644 --- a/modular_skyrat/modules/huds/code/glasses/HUD_Glasses.dm +++ b/modular_skyrat/modules/huds/code/glasses/HUD_Glasses.dm @@ -31,17 +31,18 @@ . = ..() clothing_traits += list(TRAIT_NEARSIGHTED_CORRECTED) -/obj/item/clothing/glasses/hud/science/prescription +/obj/item/clothing/glasses/science/prescription name = "prescription science glasses" desc = "These glasses scan the contents of containers and projects their contents to the user in an easy to read format. This one has prescription lenses." icon = 'modular_skyrat/modules/huds/icons/huds.dmi' icon_state = "glasses_sciencehud" worn_icon = 'modular_skyrat/modules/huds/icons/hudeyes.dmi' - flash_protect = FLASH_PROTECTION_NONE glass_colour_type = /datum/client_colour/glass_colour/purple - resistance_flags = ACID_PROOF armor_type = /datum/armor/prescription_science - clothing_traits = list(TRAIT_REAGENT_SCANNER, TRAIT_MEDICAL_HUD, TRAIT_NEARSIGHTED_CORRECTED) + +/obj/item/clothing/glasses/science/prescription/Initialize() + . = ..() + clothing_traits += list(TRAIT_NEARSIGHTED_CORRECTED) /datum/armor/prescription_science fire = 80 diff --git a/modular_skyrat/modules/modular_items/code/modular_glasses.dm b/modular_skyrat/modules/modular_items/code/modular_glasses.dm index 4a5b142084a..f9232ae9d49 100644 --- a/modular_skyrat/modules/modular_items/code/modular_glasses.dm +++ b/modular_skyrat/modules/modular_items/code/modular_glasses.dm @@ -22,6 +22,8 @@ var/list/modes_msg = list(MODE_ON = "optical matrix enabled", MODE_OFF = "optical matrix disabled") /// Because initial() will not work on subtypes from within the parent we need to store a reference to the type of the glasses calling the procs var/obj/item/clothing/glasses/hud/ar/glasses_type + /// Lazylist of traits that will not be removed if we switch modes. + var/list/permanent_clothing_traits /// Reuse logic from engine_goggles.dm /obj/item/clothing/glasses/hud/ar/Initialize(mapload) @@ -104,7 +106,7 @@ var/mob/living/carbon/human/human = user if(!ishuman(user) || human.glasses != src) // Make sure they're a human wearing the glasses first return - for(var/trait in clothing_traits) + for(var/trait in (clothing_traits - permanent_clothing_traits)) // yes, you can do /list - null, it has no side effects i can see REMOVE_CLOTHING_TRAIT(human, trait) /obj/item/clothing/glasses/hud/ar/proc/reset_vars() @@ -214,27 +216,32 @@ /obj/item/clothing/glasses/hud/ar/aviator/security/prescription name = "prescription security HUD aviators" desc = "A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records. This HUD has been fitted inside of a pair of sunglasses with toggleable electrochromatic tinting which. Has lenses that help correct eye sight." - clothing_traits = list(TRAIT_NEARSIGHTED_CORRECTED) + clothing_traits = list(TRAIT_NEARSIGHTED_CORRECTED, TRAIT_SECURITY_HUD) + permanent_clothing_traits = list(TRAIT_NEARSIGHTED_CORRECTED) /obj/item/clothing/glasses/hud/ar/aviator/health/prescription name = "prescription medical HUD aviators" desc = "A heads-up display that scans the humanoids in view and provides accurate data about their health status. This HUD has been fitted inside of a pair of sunglasses which has lenses that help correct eye sight." - clothing_traits = list(TRAIT_NEARSIGHTED_CORRECTED) + clothing_traits = list(TRAIT_NEARSIGHTED_CORRECTED, TRAIT_MEDICAL_HUD) + permanent_clothing_traits = list(TRAIT_NEARSIGHTED_CORRECTED) /obj/item/clothing/glasses/hud/ar/aviator/meson/prescription name = "prescription meson HUD aviators" desc = "A heads-up display used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting conditions. This HUD has been fitted inside of a pair of sunglasses which has lenses that help correct eye sight." clothing_traits = list(TRAIT_MADNESS_IMMUNE, TRAIT_NEARSIGHTED_CORRECTED) + permanent_clothing_traits = list(TRAIT_NEARSIGHTED_CORRECTED) /obj/item/clothing/glasses/hud/ar/aviator/diagnostic/prescription name = "prescription diagnostic HUD aviators" desc = "A heads-up display capable of analyzing the integrity and status of robotics and exosuits. This HUD has been fitted inside of a pair of sunglasses which has lenses that help correct eye sight." - clothing_traits = list(TRAIT_NEARSIGHTED_CORRECTED) + clothing_traits = list(TRAIT_NEARSIGHTED_CORRECTED, TRAIT_DIAGNOSTIC_HUD) + permanent_clothing_traits = list(TRAIT_NEARSIGHTED_CORRECTED) /obj/item/clothing/glasses/hud/ar/aviator/science/prescription name = "prescription science aviators" desc = "A pair of tacky purple aviator sunglasses that allow the wearer to recognize various chemical compounds with only a glance, which has lenses that help correct eye sight." clothing_traits = list(TRAIT_REAGENT_SCANNER, TRAIT_RESEARCH_SCANNER, TRAIT_NEARSIGHTED_CORRECTED) + permanent_clothing_traits = list(TRAIT_NEARSIGHTED_CORRECTED) // Retinal projector diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/rifle.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/rifle.dm index ae33c1ccc4d..7f4572174a1 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/rifle.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/rifle.dm @@ -26,6 +26,7 @@ projectile_type = /obj/projectile/bullet/caflechette custom_materials = AMMO_MATS_SHOTGUN_FLECH advanced_print_req = TRUE + can_be_printed = TRUE /obj/item/ammo_casing/caflechette/Initialize(mapload) . = ..() diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/magazines.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/magazines.dm index c258e4a658f..57bed6df208 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/magazines.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/magazines.dm @@ -36,6 +36,8 @@ icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/romulus_technology/ammo.dmi' icon_state = "cmg_penetrator" max_ammo = 25 + multitype = TRUE + multiple_sprites = AMMO_BOX_FULL_EMPTY /obj/item/ammo_box/magazine/caflechette/ripper name = "flechette ripper box" diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm index 10e63c044f8..41cf95c0d0a 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm @@ -156,7 +156,10 @@ var/unfolded_spread = 5 /// what's our spread with a folded stock (see above comment)? var/folded_spread = 20 - + /// Do we have any recoil if it's folded? + var/folded_recoil = 5 + ///Do we lose any recoil when it's not? + var/unfolded_recoil = 0 /obj/item/gun/ballistic/automatic/rom_flech/examine(mob/user) . = ..() . += span_notice("Alt-click to [folded ? "extend" : "collapse"] the stock.") @@ -185,8 +188,12 @@ /obj/item/gun/ballistic/automatic/rom_flech/proc/update_fold_stats() if(folded) spread = folded_spread + w_class = WEIGHT_CLASS_NORMAL + recoil = folded_recoil else spread = unfolded_spread + w_class = WEIGHT_CLASS_BULKY + recoil = unfolded_recoil update_icon() /obj/item/gun/ballistic/automatic/rom_flech/update_overlays() @@ -228,6 +235,8 @@ pin = /obj/item/firing_pin unfolded_spread = 0 folded_spread = 7 + folded_recoil = 2 + unfolded_recoil = 0 /obj/item/gun/ballistic/automatic/rom_flech/blueshield/empty spawnwithmagazine = FALSE diff --git a/modular_skyrat/modules/quirks/neutral.dm b/modular_skyrat/modules/quirks/neutral.dm index 06e62a94578..897b88bff68 100644 --- a/modular_skyrat/modules/quirks/neutral.dm +++ b/modular_skyrat/modules/quirks/neutral.dm @@ -227,16 +227,16 @@ GLOBAL_VAR_INIT(DNR_trait_overlay, generate_DNR_trait_overlay()) balloon_alert(user, "card flipped") return CLICK_ACTION_SUCCESS -/datum/quirk/feline_aspect - name = "Feline Traits" - desc = "You happen to act like a feline, for whatever reason. This will replace most other tongue-based speech quirks." +/datum/quirk/felinid_aspect + name = "Felinid Traits" + desc = "You happen to act like a felinid, for whatever reason. This will replace other tongue-based quirks." gain_text = span_notice("Nya could go for some catnip right about now...") lose_text = span_notice("You feel less attracted to lasers.") - medical_record_text = "Patient seems to possess behavior much like a feline." - mob_trait = TRAIT_FELINE + medical_record_text = "Patient seems to possess behavior much like a felinid." + mob_trait = TRAIT_FELINID icon = FA_ICON_CAT -/datum/quirk/feline_aspect/add_unique(client/client_source) +/datum/quirk/felinid_aspect/add_unique(client/client_source) var/mob/living/carbon/human/human_holder = quirk_holder var/obj/item/organ/internal/tongue/cat/new_tongue = new(get_turf(human_holder)) diff --git a/modular_skyrat/modules/taur_mechanics/code/constrict.dm b/modular_skyrat/modules/taur_mechanics/code/constrict.dm index 74ce7148b3f..08a0312f590 100644 --- a/modular_skyrat/modules/taur_mechanics/code/constrict.dm +++ b/modular_skyrat/modules/taur_mechanics/code/constrict.dm @@ -18,7 +18,7 @@ /// The tail we use to constrict mobs with. Nullable, if inactive. var/obj/structure/serpentine_tail/tail /// The base time it takes for us to constrict a mob. - var/base_coil_delay = 3.25 SECONDS + var/base_coil_delay = 2.2 SECONDS /datum/action/innate/constrict/Destroy() qdel(tail) // we already listen for COMSIG_QDELETING on our tail, so it already sets it to null via the signal diff --git a/tgstation.dme b/tgstation.dme index 01daa49b25d..c7f6602089c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3967,6 +3967,7 @@ #include "code\modules\clothing\gloves\costume.dm" #include "code\modules\clothing\gloves\insulated.dm" #include "code\modules\clothing\gloves\plasmaman.dm" +#include "code\modules\clothing\gloves\punch_mitts.dm" #include "code\modules\clothing\gloves\special.dm" #include "code\modules\clothing\gloves\tacklers.dm" #include "code\modules\clothing\head\_head.dm"