diff --git a/_maps/map_files220/generic/Admin_Zone.dmm b/_maps/map_files220/generic/Admin_Zone.dmm index 95935465a742..a2d4251101e7 100644 --- a/_maps/map_files220/generic/Admin_Zone.dmm +++ b/_maps/map_files220/generic/Admin_Zone.dmm @@ -1732,9 +1732,8 @@ }, /area/ghost_bar/indoor) "gm" = ( -/obj/structure/lattice, -/turf/space, -/area/space/centcomm) +/turf/simulated/floor/plating/airless, +/area/shuttle/vox) "gn" = ( /obj/machinery/door/airlock/hatch{ req_access_txt = "152"; @@ -2674,9 +2673,6 @@ icon_state = "alienvault" }, /area/admin) -"jC" = ( -/turf/space, -/area/shuttle/vox) "jD" = ( /obj/structure/table/wood, /obj/item/fireaxe/boneaxe, @@ -3025,10 +3021,8 @@ /turf/space, /area/space/centcomm) "kI" = ( -/obj/machinery/atmospherics/unary/tank/nitrogen{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/portable/canister/nitrogen, /turf/simulated/floor/mineral/plastitanium{ color = "#ffae00"; nitrogen = 103.984; @@ -3054,7 +3048,7 @@ /area/admin) "kN" = ( /obj/structure/shuttle/engine/huge, -/turf/simulated/floor/indestructible/transparent_floor, +/turf/simulated/floor/plating/airless, /area/shuttle/vox) "kP" = ( /obj/structure/fans/tiny/invisible, @@ -10356,7 +10350,7 @@ layer = 2.9; dir = 8 }, -/turf/simulated/floor/indestructible/transparent_floor, +/turf/simulated/floor/plating/airless, /area/shuttle/trade/sol) "Ka" = ( /turf/simulated/floor/holofloor{ @@ -11659,7 +11653,7 @@ /obj/structure/shuttle/engine/huge{ dir = 4 }, -/turf/simulated/floor/indestructible/transparent_floor, +/turf/simulated/floor/plating/airless, /area/shuttle/vox) "OO" = ( /obj/machinery/computer/camera_advanced/abductor{ @@ -13612,16 +13606,6 @@ /obj/structure/marker_beacon/spotlight/yellow, /turf/simulated/floor/beach/away/sand_alternative, /area/ghost_bar/indoor/cave) -"VH" = ( -/obj/machinery/atmospherics/portable/canister/nitrogen, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/mineral/plastitanium{ - color = "#ffae00"; - nitrogen = 103.984; - oxygen = 0; - name = "vox floor" - }, -/area/shuttle/vox) "VI" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -44440,7 +44424,7 @@ wb wb aZ gY -eZ +kH wb wb wb @@ -44696,10 +44680,10 @@ HA wb wb gY -eZ -eZ +kH +kH wb -eZ +kH HV wb wb @@ -44952,12 +44936,12 @@ fI Ax wb wb -eZ -eZ -eZ -eZ -eZ -eZ +kH +kH +kH +kH +kH +kH HV HV wb @@ -45209,13 +45193,13 @@ fI Ax Ax yV -eZ -eZ +kH +kH pz dR -eZ -eZ -eZ +kH +kH +kH wb wb HV @@ -45466,16 +45450,16 @@ Fx lj Nq yV -eZ -eZ +kH +kH Ma -eZ -eZ -eZ +kH +kH +kH gY gY -eZ -eZ +kH +kH HV HV HV @@ -45723,15 +45707,15 @@ fI lj Zt yV -eZ -eZ -eZ -eZ -eZ +kH +kH +kH +kH +kH gY gY -eZ -eZ +kH +kH HV HV wb @@ -45980,13 +45964,13 @@ fI Ax wb wb -eZ -eZ -eZ -eZ +kH +kH +kH +kH wb -eZ -eZ +kH +kH HV HV wb @@ -46219,8 +46203,8 @@ kH kH gY gY -eZ -eZ +kH +kH vE sG rC @@ -46238,8 +46222,8 @@ Ax Hd wb wb -eZ -eZ +kH +kH wb wb gY @@ -46475,8 +46459,8 @@ gY gY gY gY -eZ -eZ +kH +kH qZ qZ fI @@ -46728,7 +46712,7 @@ qZ qZ qZ HV -eZ +kH gY gY gY @@ -46987,8 +46971,8 @@ HV HV gY gY -eZ -eZ +kH +kH gY aZ qZ @@ -47246,7 +47230,7 @@ aZ qZ qZ HV -eZ +kH gY aZ HV @@ -47504,12 +47488,12 @@ fI qZ HV HV -eZ +kH gY gY -eZ -eZ -eZ +kH +kH +kH gU sG iw @@ -47761,11 +47745,11 @@ fI qZ qZ HV -eZ -eZ +kH +kH gY gY -eZ +kH gY gU sG @@ -47793,8 +47777,8 @@ kH kH kH kH -gm -gm +gY +gY gY wb kH @@ -48048,10 +48032,10 @@ fS fS hD kH -gm -gm -gm -gm +gY +gY +gY +gY aZ wb kH @@ -48302,7 +48286,7 @@ EK kI km XY -nj +gm nj kH kH @@ -48556,7 +48540,7 @@ dr ts ts ts -VH +ts oS XY kN @@ -48816,7 +48800,7 @@ hK ry rF XY -nj +gm nj kH kH @@ -49076,9 +49060,9 @@ fS fS hD kH -gm -gm -gm +gY +gY +gY aZ wb wb @@ -49334,8 +49318,8 @@ fS fS kH kH -gm -gm +gY +gY aZ wb wb @@ -50337,7 +50321,7 @@ Pm sG gU aZ -eZ +kH pc gx pc @@ -50594,7 +50578,7 @@ Wg sG gU gY -eZ +kH pc Ac pc @@ -50850,8 +50834,8 @@ ju ju fI wb -eZ -eZ +kH +kH ic Ac ic @@ -51095,7 +51079,7 @@ qZ qZ qZ aZ -eZ +kH HV wb GJ @@ -51353,7 +51337,7 @@ aZ aZ gY gY -eZ +kH wb Qf iw @@ -51607,7 +51591,7 @@ qZ qZ HV HV -eZ +kH gY gY gU @@ -51631,8 +51615,8 @@ kH kH kH kH +kH Nc -jC Nc CP Pg @@ -51888,8 +51872,8 @@ kH kH kH kH +kH Nc -jC Nc DX HY @@ -52666,9 +52650,9 @@ hD fS fS fS -nj +gm ON -nj +gm fS hD Nc @@ -52913,13 +52897,8 @@ cj yi sG gU -gm -gm -kH -kH -kH -kH -kH +gY +gY kH kH kH @@ -52927,12 +52906,17 @@ kH kH kH kH +fS +nj +nj +nj +fS kH kH kH kH kH -gm +gY HV wb wb @@ -53171,25 +53155,25 @@ St fI gU aZ -gm -gm -gm -kH -kH -kH +gY +gY +gY kH kH -gm kH kH kH -gm +nj +nj +nj +nj +nj kH kH kH kH -gm -gm +gY +gY HV SG wb @@ -53435,13 +53419,13 @@ kH kH kH kH -gm -gm kH +gY kH kH -gm -gm +kH +gY +kH kH kH kH @@ -53692,13 +53676,13 @@ HV kH kH kH -gm -gm +gY +gY kH kH kH -gm -gm +gY +gY kH kH HV @@ -53950,11 +53934,11 @@ HV HV wb wb -gm +gY kH kH kH -gm +gY wb wb wb @@ -54436,7 +54420,7 @@ gY gY gY gY -eZ +kH qZ kH qZ @@ -72846,9 +72830,9 @@ kH kH kH OC -kH -kH -kH +eZ +eZ +eZ Ch Ch QZ @@ -72857,9 +72841,9 @@ QZ QZ Ch Ch -kH -kH -kH +eZ +eZ +eZ OC XQ XQ @@ -73103,7 +73087,7 @@ kH kH kH OC -kH +eZ Ch QZ Ch @@ -73116,7 +73100,7 @@ Ch Ch QZ Ch -kH +eZ OC XQ XQ @@ -73360,7 +73344,7 @@ kH kH kH OC -kH +eZ QZ Qq Qq @@ -73373,7 +73357,7 @@ Yi Qq Qq QZ -kH +eZ OC XQ XQ @@ -73617,7 +73601,7 @@ kH kH kH OC -kH +eZ QZ Qh sJ @@ -73630,7 +73614,7 @@ Ch sJ Qh QZ -kH +eZ OC XQ XQ @@ -76701,7 +76685,7 @@ kH kH kH OC -kH +eZ ss pU vQ @@ -76714,7 +76698,7 @@ Ch vQ ss pU -kH +eZ Vx oD Ey @@ -76958,20 +76942,20 @@ kH kH kH OC -kH -kH -kH -kH -kH +eZ +eZ +eZ +eZ +eZ OC Ph Ph OC -kH -kH -kH -kH -kH +eZ +eZ +eZ +eZ +eZ Vx xa Ey diff --git a/modular_ss220/antagonists/code/guns/dartgun_ammo.dm b/modular_ss220/antagonists/code/guns/dartgun_ammo.dm index 907c494b7197..f7b13c210da6 100644 --- a/modular_ss220/antagonists/code/guns/dartgun_ammo.dm +++ b/modular_ss220/antagonists/code/guns/dartgun_ammo.dm @@ -202,7 +202,7 @@ /obj/item/reagent_containers/syringe/dart/medical/stabilizing name = "stabilizing medical dart" desc = "Медицинский дротик для стабилизации пациента." - list_reagents = list("epinephrine" = 5, "salineglucosevirusfood" = 5, "weak_omnizine" = 5) + list_reagents = list("epinephrine" = 5, "salglu_solution" = 5, "weak_omnizine" = 5) // 3 уровень (1 час) /obj/item/reagent_containers/syringe/dart/medical/advanced @@ -214,4 +214,4 @@ /obj/item/reagent_containers/syringe/dart/medical/combat name = "combat medical dart" desc = "передовой дротик с эксперементальными стимулянтами." - list_reagents = list("combatlube" = 5, "surge_plus" = 5, "syndicate_nanites" = 5) + list_reagents = list("surge_plus" = 5, "syndicate_nanites" = 5)