Merge branch 'cmss13-devs:master' into master

cmss13-devs · Feb 3, 2024 · 26910b2 · 26910b2
2 parents 4af1abf + f05470e
commit 26910b2
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 13 deletions.
diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm
@@ -1107,8 +1107,8 @@
 	name = "flare pouch"
 	desc = "A pouch designed to hold flares. Refillable with an M94 flare pack."
 	max_w_class = SIZE_SMALL
-	storage_slots = 8
-	max_storage_space = 8
+	storage_slots = 16
+	max_storage_space = 16
 	storage_flags = STORAGE_FLAGS_POUCH|STORAGE_USING_DRAWING_METHOD
 	icon_state = "flare"
 	can_hold = list(/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare/signal)

diff --git a/code/modules/clothing/suits/marine_coat.dm b/code/modules/clothing/suits/marine_coat.dm
@@ -295,6 +295,7 @@
 	desc = "A casual brown vest."
 	icon_state = "vest_brown"
 	item_state = "vest_brown"
+	flags_atom = NO_SNOW_TYPE
 	has_buttons = FALSE
 
 /obj/item/clothing/suit/storage/jacket/marine/vest/tan
@@ -316,6 +317,7 @@
 	desc = "A khaki suit jacket."
 	icon_state = "corporate_ivy"
 	item_state = "corporate_ivy"
+	flags_atom = NO_SNOW_TYPE
 	has_buttons = FALSE
 
 /obj/item/clothing/suit/storage/jacket/marine/corporate/formal
@@ -351,6 +353,7 @@
 	desc = "A khaki bomber jacket popular among stationeers and blue-collar workers everywhere."
 	icon_state = "jacket_khaki"
 	item_state = "jacket_khaki"
+	flags_atom = NO_SNOW_TYPE
 	has_buttons = FALSE
 
 /obj/item/clothing/suit/storage/jacket/marine/bomber/red

diff --git a/html/changelogs/AutoChangeLog-pr-5614.yml b/html/changelogs/AutoChangeLog-pr-5614.yml
@@ -0,0 +1,4 @@
+author: "cuberound"
+delete-after: True
+changes:
+  - balance: "increases flare pouch storage slots from 8 to 16"
diff --git a/html/changelogs/AutoChangeLog-pr-5622.yml b/html/changelogs/AutoChangeLog-pr-5622.yml
@@ -0,0 +1,4 @@
+author: "MistChristmas"
+delete-after: True
+changes:
+  - maptweak: "Add Brig Photocopier"
diff --git a/html/changelogs/AutoChangeLog-pr-5624.yml b/html/changelogs/AutoChangeLog-pr-5624.yml
@@ -0,0 +1,4 @@
+author: "BadAtThisGame302"
+delete-after: True
+changes:
+  - bugfix: "fixed the CL jackets/vests/bomber jackets sprites."
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -15008,6 +15008,22 @@
 	icon_state = "silver"
 	},
 /area/almayer/command/computerlab)
+"btn" = (
+/obj/item/device/camera{
+	pixel_x = 4;
+	pixel_y = 8
+	},
+/obj/structure/surface/table/almayer,
+/obj/item/device/camera_film{
+	pixel_x = 4;
+	pixel_y = -2
+	},
+/obj/item/device/camera_film,
+/turf/open/floor/almayer{
+	dir = 8;
+	icon_state = "red"
+	},
+/area/almayer/shipboard/brig/main_office)
 "btp" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 4
@@ -78128,16 +78144,7 @@
 	},
 /area/almayer/hallways/upper/starboard)
 "wDp" = (
-/obj/structure/surface/table/almayer,
-/obj/item/device/camera{
-	pixel_x = 4;
-	pixel_y = 8
-	},
-/obj/item/device/camera_film{
-	pixel_x = 4;
-	pixel_y = -2
-	},
-/obj/item/device/camera_film,
+/obj/structure/machinery/photocopier,
 /turf/open/floor/almayer{
 	dir = 10;
 	icon_state = "red"
@@ -92275,7 +92282,7 @@ vBm
 lOI
 pJv
 jLM
-tak
+btn
 cMb
 rbi
 wDp