Merge remote-tracking branch 'upstream/master' into bloodling_2024

.github/workflows/ci_suite.yml

@@ -70,6 +70,10 @@ jobs:
           key: ${{ runner.os }}-rust-${{ hashFiles('tools/ci/ci_dependencies.sh')}}
           restore-keys: |
             ${{ runner.os }}-rust-
+      - name: Setup .NET SDK
+        uses: actions/[email protected]
+        with:
+          dotnet-version: 9.x
       - name: Install OpenDream
         uses: robinraju/[email protected]
         with:

.gitignore

@@ -213,8 +213,8 @@ libaux*.so
 aux*.pdb
 
 # byond-tracy, we intentionally do not ship this and do not want to maintain it
-# https://github.com/mafemergency/byond-tracy/
-prof.dll
+# https://github.com/mafemergency/byond-tracy or https://github.com/ParadiseSS13/byond-tracy
+prof.*
 libprof.so
 
 # Tracy can read source files when it is in the root folder, even without absolute paths.
@@ -244,3 +244,4 @@ config/dbconfig.txt
 
 # Running OpenDream locally
 tgstation.json
+rust_g64.dll

README.md

@@ -47,6 +47,8 @@ On **2021-01-04** we changed the way to compile the codebase.
 
 [Interested in some starting lore?](https://github.com/tgstation/common_core)
 
+[Coding guidelines](https://hackmd.io/@MonkestationPooba/code_guidelines) - How and how not to code for Monkestation
+
 ## LICENSE
 
 [![license-badge](https://www.gnu.org/graphics/agplv3-155x51.png)](https://www.gnu.org/licenses/agpl-3.0.html)

_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker2.dmm

@@ -1265,9 +1265,8 @@
 /obj/item/storage/bag/quiver{
 	pixel_x = -10
 	},
-/obj/item/gun/ballistic/bow,
-/obj/item/gun/ballistic/bow{
-	pixel_y = 0;
+/obj/item/gun/ballistic/bow/longbow,
+/obj/item/gun/ballistic/bow/longbow{
 	pixel_x = 5
 	},
 /turf/open/misc/asteroid/basalt/lava_land_surface,

_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_inevitable.dmm

@@ -197,8 +197,8 @@
 /turf/open/floor/engine,
 /area/ruin/syndicate_lava_base/testlab)
 "rX" = (
-/obj/machinery/atmospherics/components/unary/passive_vent,
 /obj/structure/lattice/catwalk,
+/obj/machinery/atmospherics/components/unary/outlet_injector/on,
 /turf/template_noop,
 /area/ruin/syndicate_lava_base/testlab)
 "sa" = (

_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm

@@ -33,7 +33,7 @@
 /area/ruin/unpowered/xenonest)
 "j" = (
 /obj/structure/alien/weeds,
-/mob/living/simple_animal/hostile/alien,
+/mob/living/basic/alien,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
 "l" = (
@@ -55,7 +55,7 @@
 /area/ruin/unpowered/xenonest)
 "t" = (
 /obj/structure/alien/weeds,
-/mob/living/simple_animal/hostile/alien/sentinel,
+/mob/living/basic/alien/sentinel,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
 "u" = (
@@ -103,18 +103,18 @@
 /area/ruin/unpowered/xenonest)
 "E" = (
 /obj/structure/alien/weeds,
-/mob/living/simple_animal/hostile/alien/drone{
-	plants_off = 1
+/mob/living/basic/alien/drone{
+	can_plant_weeds = 0
 	},
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
 "F" = (
 /obj/structure/alien/weeds,
-/mob/living/simple_animal/hostile/alien/queen/large{
+/mob/living/basic/alien/queen/large{
 	desc = "A gigantic alien who is in charge of the hive and all of its loyal servants.";
 	name = "alien queen";
 	pixel_x = -16;
-	plants_off = 1
+	can_plant_weeds = 0
 	},
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
@@ -137,13 +137,13 @@
 /area/ruin/unpowered/xenonest)
 "K" = (
 /obj/structure/alien/weeds/node,
-/mob/living/simple_animal/hostile/alien,
+/mob/living/basic/alien,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
 "L" = (
 /obj/structure/alien/weeds/node,
-/mob/living/simple_animal/hostile/alien/drone{
-	plants_off = 1
+/mob/living/basic/alien/drone{
+	can_plant_weeds = 0
 	},
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
@@ -160,8 +160,8 @@
 "Q" = (
 /obj/structure/alien/weeds,
 /obj/effect/decal/cleanable/blood,
-/mob/living/simple_animal/hostile/alien/drone{
-	plants_off = 1
+/mob/living/basic/alien/drone{
+	can_plant_weeds = 0
 	},
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)

_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm

@@ -33,6 +33,7 @@
 "i" = (
 /obj/structure/rack,
 /obj/item/clothing/gloves/color/yellow,
+/obj/item/skillchip/job/engineer,
 /turf/open/floor/plating/airless,
 /area/ruin/space/abandoned_tele)
 "j" = (
@@ -71,8 +72,7 @@
 /turf/open/floor/plating/airless,
 /area/ruin/space/abandoned_tele)
 "q" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/flashlight,
+/obj/item/flashlight/flashdark,
 /turf/open/floor/plating/airless,
 /area/ruin/space/abandoned_tele)
 "r" = (
@@ -208,7 +208,7 @@ a
 a
 b
 b
-h
+q
 h
 s
 b
@@ -223,7 +223,7 @@ b
 b
 g
 l
-q
+m
 u
 h
 b

_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm

@@ -93,6 +93,7 @@
 /obj/item/clothing/suit/space/eva,
 /obj/item/tank/internals/emergency_oxygen/double,
 /obj/item/clothing/head/helmet/space/eva,
+/obj/effect/spawner/random/medical/surgery_tool_advanced,
 /turf/open/floor/iron/dark/side,
 /area/ruin/space/has_grav/abandonedzoo)
 "aV" = (
@@ -102,6 +103,7 @@
 "aW" = (
 /obj/structure/table/reinforced,
 /obj/item/gun/syringe,
+/obj/item/food/egg/raptor,
 /turf/open/floor/iron/dark/side,
 /area/ruin/space/has_grav/abandonedzoo)
 "aY" = (
@@ -140,6 +142,7 @@
 /obj/structure/table/reinforced,
 /obj/item/reagent_containers/hypospray/medipen/stimpack,
 /obj/item/reagent_containers/cup/bottle/mutagen,
+/obj/item/food/egg/cockatrice,
 /turf/open/floor/iron/dark/side,
 /area/ruin/space/has_grav/abandonedzoo)
 "bk" = (
@@ -159,7 +162,7 @@
 /area/ruin/space/has_grav/abandonedzoo)
 "bn" = (
 /obj/structure/table/reinforced,
-/obj/item/food/carrotfries,
+/obj/item/food/grown/eggplant,
 /turf/open/floor/iron/dark/side,
 /area/ruin/space/has_grav/abandonedzoo)
 "bp" = (
@@ -235,11 +238,11 @@
 /turf/open/floor/plating/airless,
 /area/template_noop)
 "bN" = (
-/obj/structure/grille/broken,
 /obj/item/stack/cable_coil/cut,
 /obj/item/shard{
 	icon_state = "small"
 	},
+/obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating/airless,
 /area/ruin/space/has_grav/abandonedzoo)
 "bO" = (
@@ -274,21 +277,23 @@
 /turf/open/floor/plating/airless,
 /area/template_noop)
 "bT" = (
-/obj/structure/grille,
 /obj/item/shard{
 	icon_state = "medium"
 	},
+/obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating/airless,
 /area/ruin/space/has_grav/abandonedzoo)
 "bU" = (
-/obj/structure/grille/broken,
+/obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating/airless,
 /area/ruin/space/has_grav/abandonedzoo)
 "bW" = (
 /obj/item/shard,
 /turf/template_noop,
 /area/template_noop)
 "bX" = (
+/obj/structure/alien/weeds,
+/obj/structure/alien/egg/fake,
 /turf/open/floor/plating/airless,
 /area/ruin/space/has_grav/abandonedzoo)
 "eY" = (
@@ -381,8 +386,15 @@
 /obj/item/crowbar,
 /obj/item/shield/riot,
 /obj/machinery/light/directional/north,
+/obj/effect/spawner/random/medical/surgery_tool_advanced,
 /turf/open/floor/iron/dark/side,
 /area/ruin/space/has_grav/abandonedzoo)
+"vy" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/green/fourcorners,
+/mob/living/basic/trooper/russian/ranged/lootless,
+/turf/open/floor/iron/dark,
+/area/ruin/space/has_grav/abandonedzoo)
 "vU" = (
 /mob/living/basic/mining/goldgrub,
 /turf/open/misc/asteroid,
@@ -433,15 +445,11 @@
 	},
 /obj/item/melee/baton/security/cattleprod,
 /obj/effect/mapping_helpers/apc/unlocked,
+/obj/effect/spawner/random/medical/surgery_tool_advanced,
+/obj/effect/spawner/random/engineering/tool_advanced,
 /turf/open/floor/iron/dark/side,
 /area/ruin/space/has_grav/abandonedzoo)
 "Mb" = (
-/mob/living/basic/bee,
-/mob/living/basic/bee,
-/mob/living/basic/bee,
-/mob/living/basic/bee,
-/mob/living/basic/bee,
-/mob/living/basic/bee,
 /turf/open/floor/grass,
 /area/ruin/space/has_grav/abandonedzoo)
 "Ng" = (
@@ -464,7 +472,6 @@
 "PF" = (
 /obj/machinery/light/directional/south,
 /mob/living/basic/bee,
-/mob/living/basic/bee,
 /turf/open/floor/grass,
 /area/ruin/space/has_grav/abandonedzoo)
 "Rh" = (
@@ -724,7 +731,7 @@ Ni
 Ni
 Ni
 Ni
-oS
+vy
 Ni
 Ni
 Ni
@@ -802,8 +809,8 @@ aa
 (14,1,1) = {"
 ac
 al
-gE
-gE
+Mb
+Mb
 aA
 ac
 at
@@ -822,8 +829,8 @@ aa
 "}
 (15,1,1) = {"
 ac
-Mb
-Mb
+gE
+gE
 ao
 PF
 ac
@@ -837,7 +844,7 @@ ac
 mY
 bH
 bH
-bB
+bX
 bT
 aa
 "}
@@ -846,7 +853,7 @@ ac
 gE
 aq
 nY
-Mb
+gE
 aD
 aL
 kp
@@ -876,10 +883,10 @@ aQ
 aQ
 aQ
 ac
+bX
 bB
 bB
-bB
-bX
+bH
 bP
 aa
 "}