Merge branch 'master' into Plasma-cutter-port

PMC-Unga-Marines · Dec 13, 2024 · 776e286 · 776e286
2 parents eacf74b + 5a4c7d6
commit 776e286
Show file tree

Hide file tree

Showing 52 changed files with 545 additions and 228 deletions.
diff --git a/_maps/map_files/Talos/TGS_Talos.dmm b/_maps/map_files/Talos/TGS_Talos.dmm
@@ -3152,15 +3152,17 @@
 /turf/open/floor/plating,
 /area/mainship/squads/req)
 "bNa" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1,
 /obj/structure/cable,
 /obj/effect/ai_node,
 /obj/structure/disposalpipe/junction/flipped{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/cyan/hidden/layer1{
+	dir = 4
+	},
 /turf/open/floor/plating/plating_catwalk/dark,
 /area/mainship/hallways/port_hallway)
 "bNx" = (

diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm
@@ -169,6 +169,7 @@
 #define COLOR_REAGENT_SULFASALAZINE "#266930"
 #define COLOR_REAGENT_DIBORANE "#1800a3"
 #define COLOR_REAGENT_STIMULON "#19C832"
+#define COLOR_REAGENT_NEUROFRENZY "#062c48"
 
 //Color defines used by toxin
 #define COLOR_TOXIN_TOXIN "#CF3600" // rgb: 207, 54, 0

diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
@@ -231,6 +231,8 @@
 
 #define isladder(A) (istype(A, /obj/structure/ladder))
 
+#define iscrate(A) (istype(A, /obj/structure/closet/crate))
+
 #define ismachinery(A) (istype(A, /obj/machinery))
 
 #define ispowermachinery(A) (istype(A, /obj/machinery/power))

diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm
@@ -102,6 +102,7 @@ GLOBAL_LIST_INIT(marine_gear_listed_products, list(
 	/obj/structure/closet/crate/mortar_ammo/mortar_kit = list(CAT_MARINE, "Mortar kit", 35, "orange3"),
 	/obj/structure/closet/crate/mortar_ammo/howitzer_kit = list(CAT_MARINE, "Howitzer kit", 35, "orange3"),
 	/obj/structure/closet/crate/mortar_ammo/mlrs_kit = list(CAT_MARINE, "MLRS kit", 35, "orange3"),
+	/obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy = list(CAT_MARINE, "N-F neurostimulator", 20, "cyan"),
 	/obj/item/reagent_containers/hypospray/autoinjector/oxycodone = list(CAT_MARINE, "Oxycodone autoinjector", 5, "cyan"),
 	/obj/item/reagent_containers/hypospray/autoinjector/russian_red = list(CAT_MARINE, "Emergency autoinjector", 10, "cyan"),
 	/obj/item/reagent_containers/hypospray/autoinjector/synaptizine	 = list(CAT_MARINE, "Synaptizine autoinjector", 8, "cyan"),

diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm
@@ -92,10 +92,6 @@
 #define PARALLAX_LOW     2
 #define PARALLAX_DISABLE 3 //this option must be the highest number
 
-#define PARALLAX_DELAY_DEFAULT world.tick_lag
-#define PARALLAX_DELAY_MED     1
-#define PARALLAX_DELAY_LOW     2
-
 #define PIXEL_SCALING_AUTO 0
 #define PIXEL_SCALING_1X 1
 #define PIXEL_SCALING_1_2X 1.5

diff --git a/code/__DEFINES/xeno.dm b/code/__DEFINES/xeno.dm
@@ -34,6 +34,7 @@
 #define DEFILER_TRANSVITOX "Transvitox"
 #define DEFILER_OZELOMELYN "Ozelomelyn"
 #define DEFILER_ACID "Sulphuric acid"
+#define DEFILER_SANGUINAL "Sanguinal"
 
 //Panther tearing tail reagents
 #define PANTHER_HEMODILE "Hemodile"