Merge remote-tracking branch 'upstream/master'

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -32964,6 +32964,10 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/oil,
 /obj/effect/turf_decal/bot,
+/obj/item/stack/ore/silver{
+	amount = 2
+	},
+/obj/item/stack/ore/iron,
 /turf/open/floor/plasteel,
 /area/quartermaster/miningoffice)
 "biu" = (

_maps/map_files/LambdaStation/lambda.dmm

@@ -19827,6 +19827,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/item/stack/ore/silver{
+	amount = 2
+	},
 /turf/open/floor/plasteel,
 /area/quartermaster/miningoffice)
 "aJC" = (
@@ -20222,6 +20225,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/item/stack/ore/iron,
 /turf/open/floor/plasteel,
 /area/quartermaster/miningoffice)
 "aKq" = (

_maps/map_files/PubbyStation/PubbyStation.dmm

@@ -61215,6 +61215,14 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/engineering)
+"vzp" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/item/stack/ore/iron,
+/obj/item/stack/ore/silver{
+	amount = 2
+	},
+/turf/open/floor/plasteel,
+/area/quartermaster/miningdock)
 "vzz" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/public/glass{
@@ -103637,7 +103645,7 @@ bbI
 bcG
 bdM
 beP
-bfH
+vzp
 bfH
 bhv
 bbI

_maps/shuttles/whiteship_box.dmm

@@ -1560,6 +1560,7 @@
 /area/shuttle/abandoned/bridge)
 "cc" = (
 /obj/machinery/door/airlock/external,
+/obj/structure/fans/tiny,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 1
 	},

code/__DEFINES/tgs.dm

@@ -1,6 +1,6 @@
 // tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "5.2.9"
+#define TGS_DMAPI_VERSION "5.2.10"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 
@@ -67,7 +67,7 @@
 #define TGS_EVENT_REPO_CHECKOUT 1
 /// When the repository performs a fetch operation. No parameters
 #define TGS_EVENT_REPO_FETCH 2
-/// When the repository merges a pull request. Parameters: PR Number, PR Sha, (Nullable) Comment made by TGS user
+/// When the repository test merges. Parameters: PR Number, PR Sha, (Nullable) Comment made by TGS user
 #define TGS_EVENT_REPO_MERGE_PULL_REQUEST 3
 /// Before the repository makes a sychronize operation. Parameters: Absolute repostiory path
 #define TGS_EVENT_REPO_PRE_SYNCHRONIZE 4
@@ -190,21 +190,21 @@
 
 /// Represents a merge of a GitHub pull request.
 /datum/tgs_revision_information/test_merge
-	/// The pull request number.
+	/// The test merge number.
 	var/number
-	/// The pull request title when it was merged.
+	/// The test merge source's title when it was merged.
 	var/title
-	/// The pull request body when it was merged.
+	/// The test merge source's body when it was merged.
 	var/body
-	/// The GitHub username of the pull request's author.
+	/// The Username of the test merge source's author.
 	var/author
-	/// An http URL to the pull request.
+	/// An http URL to the test merge source.
 	var/url
-	/// The SHA of the pull request when that was merged.
+	/// The SHA of the test merge when that was merged.
 	var/pull_request_commit
-	/// ISO 8601 timestamp of when the pull request was merged.
+	/// ISO 8601 timestamp of when the test merge was created on TGS.
 	var/time_merged
-	/// (Nullable) Comment left by the TGS user who initiated the merge..
+	/// Optional comment left by the TGS user who initiated the merge.
 	var/comment
 
 /// Represents a connected chat channel.

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -47,6 +47,25 @@
 	new /obj/item/clothing/glasses/hud/health(src)
 	return
 
+/obj/structure/closet/secure_closet/paramedic
+    name = "paramedic's locker"
+    req_access = list(ACCESS_MEDICAL)
+    icon_state = "paramed_secure"
+
+/obj/structure/closet/secure_closet/paramedic/PopulateContents()
+    ..()
+    new /obj/item/clothing/suit/toggle/labcoat/paramedic(src)
+    new /obj/item/clothing/under/rank/medical/paramedic(src)
+    new /obj/item/clothing/under/rank/medical/paramedic/skirt(src)
+    new /obj/item/radio/headset/headset_med(src)
+    new /obj/item/defibrillator/loaded(src)
+    new /obj/item/clothing/gloves/color/latex/nitrile(src)
+    new /obj/item/storage/belt/medical(src)
+    new /obj/item/clothing/glasses/hud/health(src)
+    new /obj/item/pinpointer/crew(src)
+    new /obj/item/sensor_device(src)
+    return
+
 /obj/structure/closet/secure_closet/CMO
 	name = "\proper chief medical officer's locker"
 	req_access = list(ACCESS_CMO)

code/modules/cargo/packs/livestock.dm

@@ -34,10 +34,55 @@
 
 /datum/supply_pack/critter/parrot/generate()
 	. = ..()
-	for(var/i in 1 to 4)
-		new /mob/living/simple_animal/parrot(.)
-	if(prob(1))
-		new /mob/living/simple_animal/parrot/clock_hawk(.)
+	for(var/i in 1 to 5)
+		switch(rand(1, 23))
+			if(1)
+				new /mob/living/simple_animal/parrot(.)
+			if(2)
+				new /mob/living/simple_animal/parrot/clock_hawk(.)
+			if(3)
+				new /mob/living/simple_animal/parrot/kea(.)
+			if(4)
+				new /mob/living/simple_animal/parrot/eclectus(.)
+			if(5)
+				new /mob/living/simple_animal/parrot/eclectusf(.)
+			if(6)
+				new /mob/living/simple_animal/parrot/greybird(.)
+			if(7)
+				new /mob/living/simple_animal/parrot/blue_caique(.)
+			if(8)
+				new /mob/living/simple_animal/parrot/white_caique(.)
+			if(9)
+				new /mob/living/simple_animal/parrot/green_budgerigar(.)
+			if(10)
+				new /mob/living/simple_animal/parrot/blue_Budgerigar(.)
+			if(11)
+				new /mob/living/simple_animal/parrot/bluegreen_Budgerigar(.)
+			if(12)
+				new /mob/living/simple_animal/parrot/commonblackbird(.)
+			if(13)
+				new /mob/living/simple_animal/parrot/azuretit(.)
+			if(14)
+				new /mob/living/simple_animal/parrot/europeanrobin(.)
+			if(15)
+				new /mob/living/simple_animal/parrot/goldcrest(.)
+			if(16)
+				new /mob/living/simple_animal/parrot/ringneckdove(.)
+			if(17)
+				new /mob/living/simple_animal/parrot/cockatiel(.)
+			if(18)
+				new /mob/living/simple_animal/parrot/white_cockatiel(.)
+			if(19)
+				new /mob/living/simple_animal/parrot/yellowish_cockatiel(.)
+			if(20)
+				new /mob/living/simple_animal/parrot/grey_cockatiel(.)
+			if(21)
+				new /mob/living/simple_animal/parrot/too(.)
+			if(22)
+				new /mob/living/simple_animal/parrot/hooded_too(.)
+			if(23)
+				new /mob/living/simple_animal/parrot/pink_too(.)
+
 
 /datum/supply_pack/critter/butterfly
 	name = "Butterflies Crate"

code/modules/mob/living/simple_animal/parrot.dm

@@ -1034,3 +1034,131 @@
 
 /mob/living/simple_animal/parrot/clock_hawk/ratvar_act()
 	return
+
+// Different Parrot Breeds
+
+/mob/living/simple_animal/parrot/kea
+	name = "Kea"
+	icon_state = "kea-flap"
+	icon_living = "kea-flap"
+	icon_dead = "kea-dead"
+
+/mob/living/simple_animal/parrot/eclectus
+	name = "Eclectus"
+	icon_state = "eclectus-flap"
+	icon_living = "eclectus-flap"
+	icon_dead = "eclectus-dead"
+
+/mob/living/simple_animal/parrot/eclectusf
+	name = "Eclectus"
+	icon_state = "eclectusf-flap"
+	icon_living = "eclectusf-flap"
+	icon_dead = "eclectusf-dead"
+
+/mob/living/simple_animal/parrot/greybird
+	name = "Grey Bird"
+	icon_state = "agrey-flap"
+	icon_living = "agrey-flap"
+	icon_dead = "agrey-dead"
+
+/mob/living/simple_animal/parrot/blue_caique
+	name = "Blue Caique "
+	icon_state = "bcaique-flap"
+	icon_living = "bcaique-flap"
+	icon_dead = "bcaique-dead"
+
+/mob/living/simple_animal/parrot/white_caique
+	name = "White caique"
+	icon_state = "wcaique-flap"
+	icon_living = "wcaique-flap"
+	icon_dead = "wcaique-dead"
+
+/mob/living/simple_animal/parrot/green_budgerigar
+	name = "Green Budgerigar"
+	icon_state = "gbudge-flap"
+	icon_living = "gbudge-flap"
+	icon_dead = "gbudge-dead"
+
+/mob/living/simple_animal/parrot/blue_Budgerigar
+	name = "Blue Budgerigar"
+	icon_state = "bbudge-flap"
+	icon_living = "bbudge-flap"
+	icon_dead = "bbudge-dead"
+
+/mob/living/simple_animal/parrot/bluegreen_Budgerigar
+	name = "Bluegreen Budgerigar"
+	icon_state = "bgbudge-flap"
+	icon_living = "bgbudge-flap"
+	icon_dead = "bgbudge-dead"
+
+/mob/living/simple_animal/parrot/commonblackbird
+	name = "Black Bird"
+	icon_state = "commonblackbird"
+	icon_living = "commonblackbird"
+	icon_dead = "commonblackbird-dead"
+
+/mob/living/simple_animal/parrot/azuretit
+	name = "Azure Tit"
+	icon_state = "azuretit"
+	icon_living = "azuretit"
+	icon_dead = "azuretit-dead"
+
+/mob/living/simple_animal/parrot/europeanrobin
+	name = "European Robin"
+	icon_state = "europeanrobin"
+	icon_living = "europeanrobin"
+	icon_dead = "europeanrobin-dead"
+
+/mob/living/simple_animal/parrot/goldcrest
+	name = "Goldcrest"
+	icon_state = "goldcrest"
+	icon_living = "goldcrest"
+	icon_dead = "goldcrest-dead"
+
+/mob/living/simple_animal/parrot/ringneckdove
+	name = "Ringneck Dove"
+	icon_state = "ringneckdove"
+	icon_living = "ringneckdove"
+	icon_dead = "ringneckdove-dead"
+
+/mob/living/simple_animal/parrot/cockatiel
+	name = "Cockatiel"
+	icon_state = "tiel-flap"
+	icon_living = "tiel-flap"
+	icon_dead = "tiel-dead"
+
+/mob/living/simple_animal/parrot/white_cockatiel
+	name = "White Cockatiel"
+	icon_state = "wtiel-flap"
+	icon_living = "wtiel-flap"
+	icon_dead = "wtiel-dead"
+
+/mob/living/simple_animal/parrot/yellowish_cockatiel
+	name = "Yellowish Cockatiel"
+	icon_state = "luttiel-flap"
+	icon_living = "luttiel-flap"
+	icon_dead = "luttiel-dead"
+
+/mob/living/simple_animal/parrot/grey_cockatiel
+	name = "Grey Cockatiel"
+	icon_state = "blutiel-flap"
+	icon_living = "blutiel-flap"
+	icon_dead = "blutiel-dead"
+
+/mob/living/simple_animal/parrot/too
+	name = "Too"
+	icon_state = "too-flap"
+	icon_living = "too-flap"
+	icon_dead = "too-dead"
+
+/mob/living/simple_animal/parrot/hooded_too
+	name = "Utoo"
+	icon_state = "utoo-flap"
+	icon_living = "utoo-flap"
+	icon_dead = "utoo-dead"
+
+/mob/living/simple_animal/parrot/pink_too
+	name = "Mtoo"
+	icon_state = "mtoo-flap"
+	icon_living = "mtoo-flap"
+	icon_dead = "mtoo-dead"

code/modules/tgs/v5/api.dm

@@ -98,18 +98,19 @@
 	return json_encode(response)
 
 /datum/tgs_api/v5/OnTopic(T)
-	if(!initialized)
-		return FALSE	//continue world/Topic
-
 	var/list/params = params2list(T)
 	var/json = params[DMAPI5_TOPIC_DATA]
 	if(!json)
-		return FALSE
+		return FALSE // continue to /world/Topic
 
 	var/list/topic_parameters = json_decode(json)
 	if(!topic_parameters)
 		return TopicResponse("Invalid topic parameters json!");
 
+	if(!initialized)
+		TGS_WARNING_LOG("Missed topic due to not being initialized: [T]")
+		return TRUE	// too early to handle, but it's still our responsibility
+
 	var/their_sCK = topic_parameters[DMAPI5_PARAMETER_ACCESS_IDENTIFIER]
 	if(their_sCK != access_identifier)
 		return TopicResponse("Failed to decode [DMAPI5_PARAMETER_ACCESS_IDENTIFIER] from: [json]!");

html/changelogs/AutoChangeLog-pr-13855.yml

@@ -0,0 +1,8 @@
+author: "Chiirno"
+delete-after: True
+changes: 
+  - rscadd: "Paramedics office and Surgery Storage Room"
+  - tweak: "Remodeled the surgery room, as well as shrunk Morgue and Starboard Emergency Storage.
+Fiddled with some areas for better map edit clarity and fixed one runtime in Vacant Office A."
+  - imageadd: "Added the paramedic closet sprite, a paramedic colored medical3 closet."
+  - code_imp: "Added a paramedic closet, which is the standard medical3 closet with their suit, a pinpointer, and a crew monitor added."

html/changelogs/AutoChangeLog-pr-13884.yml

@@ -0,0 +1,5 @@
+author: "Hatterhat"
+delete-after: True
+changes: 
+  - rscadd: "The dock-silver standard set by Box and Meta has been enforced across maps in rotation (Delta, Pubby, Lambda)."
+  - bugfix: "The Box whiteship now has its missing tiny fan back."

html/changelogs/AutoChangeLog-pr-13900.yml

@@ -0,0 +1,4 @@
+author: "Xantholne"
+delete-after: True
+changes: 
+  - rscadd: "New parrots from the RP server, can be found in Bird Crate in Cargo"