Merge branch 'master' of https://github.com/tgstation/TerraGov-Marine…

…-Corps
Xander3359 · Feb 15, 2024 · d553364 · d553364
2 parents a682ea7 + d97b22e
commit d553364
Show file tree

Hide file tree

Showing 188 changed files with 2,152 additions and 680 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,7 @@ Thumbs.db
 data/
 cfg/
 tmp/
+/cache/**/*
 tools/Runtime Condenser/Input.txt
 tools/Runtime Condenser/Output.txt
 tools/MapDaemon/logs/*.txt

diff --git a/_maps/map_files/Arachne/TGS_Arachne.dmm b/_maps/map_files/Arachne/TGS_Arachne.dmm
@@ -7864,9 +7864,7 @@
 	dir = 1
 	},
 /obj/effect/ai_node,
-/obj/structure/disposalpipe/junction/flipped{
-	dir = 8
-	},
+/obj/structure/disposalpipe/junction/yjunc,
 /turf/open/floor/mainship/sterile,
 /area/mainship/medical/lower_medical)
 "gLH" = (

diff --git a/_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm b/_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm
@@ -6716,7 +6716,7 @@
 /area/campaign/jungle_outpost/outpost/landing)
 "BU" = (
 /obj/structure/table/mainship,
-/obj/item/trash/barcardine,
+/obj/item/trash/barcaridine,
 /turf/open/floor/tile/neutral/full,
 /area/campaign/jungle_outpost/outpost/living/canteen)
 "BV" = (

diff --git a/_maps/map_files/Campaign maps/nt_base/nt_base.dmm b/_maps/map_files/Campaign maps/nt_base/nt_base.dmm
@@ -27071,7 +27071,7 @@
 	},
 /area/gelida/indoors/a_block/admin)
 "tKl" = (
-/obj/item/trash/barcardine,
+/obj/item/trash/barcaridine,
 /turf/open/floor/prison,
 /area/gelida/indoors/a_block/hallway)
 "tKn" = (
@@ -28497,7 +28497,7 @@
 /turf/open/floor/prison/darkbrown/full,
 /area/gelida/landing_zone_1)
 "uPv" = (
-/obj/item/trash/barcardine,
+/obj/item/trash/barcaridine,
 /turf/open/floor/prison/blue,
 /area/gelida/indoors/a_block/hallway)
 "uPN" = (

diff --git a/_maps/map_files/Lawanka_Outpost/LawankaOutpost.dmm b/_maps/map_files/Lawanka_Outpost/LawankaOutpost.dmm
@@ -4503,7 +4503,7 @@
 /area/lawankaoutpost/caves/nanotrasen_lab)
 "dNa" = (
 /obj/structure/table/reinforced,
-/obj/item/trash/barcardine,
+/obj/item/trash/barcaridine,
 /turf/open/floor/plating/ground/dirt,
 /area/lawankaoutpost/outside/central)
 "dND" = (

diff --git a/_maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm b/_maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm
@@ -1470,7 +1470,7 @@
 /obj/structure/bed/bunkbed,
 /obj/effect/landmark/start/job/squadmarine,
 /obj/effect/landmark/start/job/squadmarine,
-/obj/item/trash/barcardine,
+/obj/item/trash/barcaridine,
 /obj/machinery/firealarm{
 	dir = 8
 	},
@@ -12440,7 +12440,7 @@
 /obj/structure/bed/bunkbed,
 /obj/effect/landmark/start/job/squadmarine,
 /obj/effect/landmark/start/job/squadmarine,
-/obj/item/trash/barcardine,
+/obj/item/trash/barcaridine,
 /turf/open/floor/wood,
 /area/mainship/living/cryo_cells)
 "pHV" = (

diff --git a/_maps/map_files/Research_Outpost/Research_Outpost.dmm b/_maps/map_files/Research_Outpost/Research_Outpost.dmm
@@ -1990,7 +1990,7 @@
 /obj/machinery/light/small{
 	dir = 8
 	},
-/obj/item/trash/barcardine,
+/obj/item/trash/barcaridine,
 /turf/open/floor/wood,
 /area/outpost/dormitories)
 "jE" = (
@@ -9486,7 +9486,7 @@
 /turf/open/floor/plating/ground/mars/random/cave,
 /area/outpost/caves/north)
 "Sv" = (
-/obj/item/trash/barcardine,
+/obj/item/trash/barcaridine,
 /turf/open/floor/wood,
 /area/outpost/dormitories)
 "Sw" = (

diff --git a/_maps/map_files/desparity/desparity.dmm b/_maps/map_files/desparity/desparity.dmm
@@ -5981,7 +5981,7 @@
 /area/lv624/ground/caves/west1)
 "Fe" = (
 /obj/structure/table,
-/obj/item/trash/barcardine,
+/obj/item/trash/barcaridine,
 /obj/item/clothing/suit/armor/vest/security{
 	pixel_x = 5;
 	pixel_y = 5

diff --git a/_maps/map_files/gelida_iv/gelida_iv.dmm b/_maps/map_files/gelida_iv/gelida_iv.dmm
@@ -29330,7 +29330,7 @@
 	},
 /area/gelida/indoors/a_block/admin)
 "tKl" = (
-/obj/item/trash/barcardine,
+/obj/item/trash/barcaridine,
 /turf/open/floor/prison,
 /area/gelida/indoors/a_block/hallway)
 "tKn" = (
@@ -30824,7 +30824,7 @@
 /turf/open/floor/prison/darkbrown/full,
 /area/gelida/landing_zone_1)
 "uPv" = (
-/obj/item/trash/barcardine,
+/obj/item/trash/barcaridine,
 /turf/open/floor/prison/blue,
 /area/gelida/indoors/a_block/hallway)
 "uPN" = (

diff --git a/_maps/map_files/slumbridge/slumbridge.dmm b/_maps/map_files/slumbridge/slumbridge.dmm
@@ -845,7 +845,7 @@
 /turf/open/floor/tile/white,
 /area/slumbridge/inside/pmcdome/dorms)
 "aLp" = (
-/obj/item/trash/barcardine,
+/obj/item/trash/barcaridine,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold/green/hidden,
 /turf/open/floor/tile/green/whitegreen{
@@ -7822,7 +7822,7 @@
 /area/slumbridge/inside/pmcdome)
 "fYc" = (
 /obj/structure/table,
-/obj/item/trash/barcardine,
+/obj/item/trash/barcaridine,
 /turf/open/floor/tile/green/whitegreen{
 	dir = 1
 	},
@@ -26353,7 +26353,7 @@
 "twh" = (
 /obj/structure/table/gamblingtable,
 /obj/item/toy/dice/d20,
-/obj/item/trash/barcardine,
+/obj/item/trash/barcaridine,
 /obj/machinery/atmospherics/pipe/simple/green/hidden{
 	dir = 5
 	},

diff --git a/_maps/modularmaps/big_red/bigredmedbayvar4.dmm b/_maps/modularmaps/big_red/bigredmedbayvar4.dmm
@@ -314,6 +314,9 @@
 /area/bigredv2/outside/medical)
 "js" = (
 /obj/structure/bed/roller,
+/obj/machinery/atmospherics/pipe/simple/green/hidden{
+	dir = 4
+	},
 /turf/open/floor/tile/green/whitegreen{
 	dir = 8
 	},
@@ -334,6 +337,13 @@
 /obj/effect/spawner/random/engineering/toolbox,
 /turf/open/floor/plating,
 /area/bigredv2/outside/medical)
+"kC" = (
+/obj/effect/ai_node,
+/obj/machinery/atmospherics/pipe/simple/green/hidden{
+	dir = 9
+	},
+/turf/open/floor/tile/white,
+/area/bigredv2/outside/medical)
 "kD" = (
 /obj/item/healthanalyzer,
 /turf/open/floor/tile/green/whitegreencorner,
@@ -2002,7 +2012,7 @@ Zg
 bx
 nl
 hQ
-Hm
+fk
 zx
 SR
 tC
@@ -2030,7 +2040,7 @@ OI
 Yk
 jh
 rB
-hQ
+kC
 ys
 Cp
 OC

diff --git a/_maps/modularmaps/big_red/bigredmedbayvar5.dmm b/_maps/modularmaps/big_red/bigredmedbayvar5.dmm
@@ -843,6 +843,9 @@
 /area/bigredv2/outside/medical)
 "vV" = (
 /obj/structure/bed/roller,
+/obj/machinery/atmospherics/pipe/simple/green/hidden{
+	dir = 4
+	},
 /turf/open/floor/tile/green/whitegreen{
 	dir = 8
 	},
@@ -1442,6 +1445,13 @@
 /obj/effect/spawner/random/engineering/toolbox,
 /turf/open/floor/plating,
 /area/bigredv2/outside/medical)
+"Mk" = (
+/obj/effect/ai_node,
+/obj/machinery/atmospherics/pipe/simple/green/hidden{
+	dir = 9
+	},
+/turf/open/floor/tile/white,
+/area/bigredv2/outside/medical)
 "Mp" = (
 /obj/structure/morgue{
 	dir = 1
@@ -2055,7 +2065,7 @@ Yn
 lv
 HT
 gj
-gL
+Re
 na
 oG
 IT
@@ -2083,7 +2093,7 @@ Zu
 Ko
 Uv
 fI
-gj
+Mk
 MO
 KD
 GW

diff --git a/_maps/shuttles/tgs_canterbury.dmm b/_maps/shuttles/tgs_canterbury.dmm
@@ -530,13 +530,11 @@
 /turf/open/floor/mainship/sterile/dark,
 /area/shuttle/canterbury/medical)
 "cc" = (
-/obj/machinery/door/window/right{
-	dir = 1
-	},
+/obj/effect/landmark/start/job/crash/squadsmartgunner,
 /obj/structure/window/reinforced/toughened{
-	dir = 4
+	dir = 1
 	},
-/obj/effect/landmark/start/job/crash/squadsmartgunner,
+/obj/machinery/door/window/right,
 /turf/open/floor/mainship/red,
 /area/shuttle/canterbury)
 "cd" = (

diff --git a/code/__DEFINES/cooldowns.dm b/code/__DEFINES/cooldowns.dm
@@ -101,6 +101,7 @@
 
 #define TIMER_COOLDOWN_START(cd_source, cd_index, cd_time) LAZYSET(cd_source.cooldowns, cd_index, addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(end_cooldown), cd_source, cd_index), cd_time))
 
+/// Returns TRUE if still cooling down, FALSE otherwise
 #define TIMER_COOLDOWN_CHECK(cd_source, cd_index) LAZYACCESS(cd_source.cooldowns, cd_index)
 
 #define TIMER_COOLDOWN_END(cd_source, cd_index) LAZYREMOVE(cd_source.cooldowns, cd_index)

diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm
@@ -121,7 +121,8 @@
 #define ABOVE_LYING_MOB_LAYER 3.9 //drone (not the xeno)
 
 //#define MOB_LAYER 4
-#define RIVER_OVERLAY_LAYER 4.01
+
+#define MOB_JUMP_LAYER 4.05
 
 #define ABOVE_MOB_LAYER 4.1
 

diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm
@@ -87,7 +87,7 @@ GLOBAL_LIST_INIT(engineer_gear_listed_products, list(
 		/obj/item/minerupgrade/automatic = list(CAT_ENGSUP, "Mining well automation upgrade", 4, "black"),
 		/obj/item/storage/pouch/explosive/razorburn = list(CAT_ENGSUP, "Pack of Razorburn grenades", 11, "orange"),
 		/obj/item/explosive/grenade/chem_grenade/razorburn_large = list(CAT_ENGSUP, "Razorburn canister", 7, "black"),
-		/obj/item/explosive/grenade/chem_grenade/razorburn_smol = list(CAT_ENGSUP, "Razorburn grenade", 3, "black"),
+		/obj/item/explosive/grenade/chem_grenade/razorburn_small = list(CAT_ENGSUP, "Razorburn grenade", 3, "black"),
 		/obj/item/mortal_shell/he = list(CAT_ENGSUP, "HE Mortar shell", 2, "black"),
 		/obj/item/mortal_shell/incendiary = list(CAT_ENGSUP, "Incendiary Mortar shell", 2, "black"),
 		/obj/item/mortal_shell/plasmaloss = list(CAT_ENGSUP, "Tanglefoot Mortar shell", 2, "black"),
@@ -138,7 +138,7 @@ GLOBAL_LIST_INIT(leader_gear_listed_products, list(
 		/obj/item/explosive/grenade/incendiary = list(CAT_LEDSUP, "M40 HIDP incendiary grenade", 3, "black"),
 		/obj/item/storage/pouch/explosive/razorburn = list(CAT_LEDSUP, "Pack of Razorburn grenades", 24, "orange"),
 		/obj/item/explosive/grenade/chem_grenade/razorburn_large = list(CAT_LEDSUP, "Razorburn canister", 21, "black"),
-		/obj/item/explosive/grenade/chem_grenade/razorburn_smol = list(CAT_LEDSUP, "Razorburn grenade", 6, "black"),
+		/obj/item/explosive/grenade/chem_grenade/razorburn_small = list(CAT_LEDSUP, "Razorburn grenade", 6, "black"),
 		/obj/item/weapon/gun/flamer/big_flamer/marinestandard = list(CAT_LEDSUP, "FL-84 flamethrower", 12, "black"),
 		/obj/item/ammo_magazine/flamer_tank/large = list(CAT_LEDSUP, "Flamethrower tank", 4, "black"),
 		/obj/item/storage/backpack/marine/radiopack = list(CAT_LEDSUP, "Radio Pack", 15, "black"),
@@ -162,7 +162,7 @@ GLOBAL_LIST_INIT(commander_gear_listed_products, list(
 		/obj/item/explosive/grenade/incendiary = list(CAT_FCSUP, "M40 HIDP incendiary grenade", 3, "black"),
 		/obj/item/storage/pouch/explosive/razorburn = list(CAT_FCSUP, "Pack of Razorburn grenades", 24, "orange"),
 		/obj/item/explosive/grenade/chem_grenade/razorburn_large = list(CAT_FCSUP, "Razorburn canister", 21, "black"),
-		/obj/item/explosive/grenade/chem_grenade/razorburn_smol = list(CAT_FCSUP, "Razorburn grenade", 6, "black"),
+		/obj/item/explosive/grenade/chem_grenade/razorburn_small = list(CAT_FCSUP, "Razorburn grenade", 6, "black"),
 		/obj/item/weapon/gun/flamer/big_flamer/marinestandard = list(CAT_FCSUP, "FL-84 flamethrower", 12, "black"),
 		/obj/item/ammo_magazine/flamer_tank/large = list(CAT_FCSUP, "Flamethrower tank", 4, "black"),
 		/obj/item/storage/backpack/marine/radiopack = list(CAT_FCSUP, "Radio Pack", 15, "black"),
@@ -703,7 +703,7 @@ GLOBAL_LIST_INIT(job_specific_clothes_vendor, list(
 GLOBAL_LIST_INIT(loadout_role_essential_set, list(
 	SQUAD_ENGINEER = list (
 		/obj/item/explosive/plastique = 1,
-		/obj/item/explosive/grenade/chem_grenade/razorburn_smol = 1,
+		/obj/item/explosive/grenade/chem_grenade/razorburn_small = 1,
 		/obj/item/clothing/gloves/marine/insulated = 1,
 		/obj/item/cell/high = 1,
 		/obj/item/lightreplacer = 1,

diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
@@ -480,6 +480,7 @@ GLOBAL_LIST_INIT(xenoupgradetiers, list(XENO_UPGRADE_BASETYPE, XENO_UPGRADE_INVA
 #define XENO_GARGOYLE_DETECTION_COOLDOWN 30 SECONDS
 #define XENO_GARGOYLE_DETECTION_RANGE 10//How far gargoyles can detect hostiles
 #define XENO_RESTING_COOLDOWN 2 SECONDS
+#define XENO_UNRESTING_COOLDOWN 0.5 SECONDS
 
 #define XENO_HIVEMIND_DETECTION_RANGE 10 //How far out (in tiles) can the hivemind detect hostiles
 #define XENO_HIVEMIND_DETECTION_COOLDOWN 1 MINUTES

diff --git a/code/__DEFINES/span.dm b/code/__DEFINES/span.dm
@@ -68,11 +68,6 @@
 #define span_season_additional_info(str) ("<span class='season_additional_info'>" + str + "</span>")
 #define span_announce_header(str) ("<span class='announce_header'>" + str + "</span>")
 #define span_announce_body(str) ("<span class='announce_body'>" + str + "</span>")
-#define span_faction_alert(str) ("<span class='faction_alert'>" + str + "</span>")
-#define span_faction_alert_title(str) ("<span class='faction_alert_title'>" + str + "</span>")
-#define span_faction_alert_minortitle(str) ("<span class='faction_alert_minortitle'>" + str + "</span>")
-#define span_faction_alert_subtitle(str) ("<span class='faction_alert_subtitle'>" + str + "</span>")
-#define span_faction_alert_text(str) ("<span class='faction_alert_text'>" + str + "</span>")
 #define span_seasons_announce(str) ("<span class='seasons_announce'>" + str + "</span>")
 #define span_suicide(str) ("<span class='suicide'>" + str + "</span>")
 #define span_tip(str) ("<span class='tip'>" + str + "</span>")