Merge branch 'master' into MARSOC

cmss13-devs · Apr 4, 2024 · a2627d2 · a2627d2
2 parents 9f6f791 + d647f3b
commit a2627d2
Show file tree

Hide file tree

Showing 9 changed files with 75,599 additions and 9 deletions.
diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm
@@ -42,6 +42,7 @@ block( \
 #define MAP_RUNTIME "USS Runtime"
 #define MAP_LV522_CHANCES_CLAIM "LV-522 Chance's Claim" // Highpop Only
 #define MAP_NEW_VARADERO "New Varadero"//ice colony underground but as its own map
+#define MAP_NEW_VARADERO_REPAIRED "New Varadero Repaired"
 #define MAP_CHINOOK "Chinook 91 GSO" //admin level
 #define MAP_DERELICT_ALMAYER "Derelict Almayer"
 

diff --git a/code/game/objects/items/storage/misc.dm b/code/game/objects/items/storage/misc.dm
@@ -129,7 +129,7 @@
 	desc = "A small case containing the once-standard sidearm of the UPP, the Type 73, and two additional magazines. The contained sidearm is probably looted off a dead officer or from a captured stockpile, either way this thing is worth a pretty penny."
 	icon = 'icons/obj/items/storage.dmi'
 	icon_state = "matebacase"
-	w_class = SIZE_MEDIUM
+	w_class = SIZE_LARGE
 	max_w_class = SIZE_MEDIUM
 	storage_slots = 3
 
@@ -143,7 +143,7 @@
 	desc = "A relatively large storage case containing the 1911 and additional magazines. Purchased by enlisted or aspiring PMCs looking to carry a timeless classic"
 	icon = 'icons/obj/items/storage.dmi'
 	icon_state = "matebacase"
-	w_class = SIZE_MEDIUM
+	w_class = SIZE_LARGE
 	max_w_class = SIZE_MEDIUM
 	storage_slots = 3
 

diff --git a/code/game/objects/structures/crates_lockers/closets/secure/marine_personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/marine_personal.dm
@@ -20,7 +20,7 @@
 	return ..()
 
 /obj/structure/closet/secure_closet/marine_personal/allowed(mob/M)
-	if(owner == M.name)
+	if(owner == M.real_name)
 		return TRUE
 	return FALSE
 

diff --git a/code/modules/cm_marines/equipment/maps.dm b/code/modules/cm_marines/equipment/maps.dm
@@ -165,6 +165,7 @@ GLOBAL_LIST_INIT_TYPED(map_type_list, /obj/item/map, setup_all_maps())
 		MAP_KUTJEVO = new /obj/item/map/kutjevo_map(),
 		MAP_LV522_CHANCES_CLAIM = new /obj/item/map/lv522_map(),
 		MAP_NEW_VARADERO = new /obj/item/map/new_varadero(),
+		MAP_NEW_VARADERO_REPAIRED = new /obj/item/map/new_varadero(),
 		MAP_DERELICT_ALMAYER = new /obj/item/map/almayer(),
 	)
 

diff --git a/code/modules/projectiles/ammo_boxes/round_boxes.dm b/code/modules/projectiles/ammo_boxes/round_boxes.dm
@@ -48,6 +48,7 @@
 	overlay_content = "_reg"
 	default_ammo = /datum/ammo/bullet/smartgun
 	caliber = "10x28mm"
+	bullet_amount = 1000
 	max_bullet_amount = 1000
 
 /obj/item/ammo_box/rounds/smartgun/empty

diff --git a/map_config/maps.txt b/map_config/maps.txt
@@ -64,6 +64,9 @@ endmap
 map new_varadero
 endmap
 
+map new_varadero_repaired
+endmap
+
 map derelict_almayer
 endmap
 

diff --git a/maps/map_files/LV624_Fixed/LV624_repaired.dmm b/maps/map_files/LV624_Fixed/LV624_repaired.dmm
@@ -4636,6 +4636,9 @@
 /obj/structure/flora/bush/ausbushes/var3/leafybush,
 /turf/open/auto_turf/strata_grass/layer1,
 /area/lv624/ground/caves/central_caves)
+"faY" = (
+/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east,
+/area/lv624/ground/jungle/south_central_jungle)
 "faZ" = (
 /obj/structure/surface/table,
 /obj/item/tool/kitchen/utensil/knife,
@@ -5838,7 +5841,7 @@
 /area/lv624/lazarus/landing_zones/lz1)
 "gxv" = (
 /obj/structure/surface/table/reinforced/prison,
-/obj/structure/machinery/faxmachine,
+/obj/structure/machinery/faxmachine/corporate/liaison,
 /turf/open/floor{
 	dir = 9;
 	icon_state = "whiteyellow"
@@ -16947,7 +16950,6 @@
 "sPK" = (
 /obj/structure/machinery/door/airlock/almayer/generic{
 	dir = 1;
-	locked = 1;
 	name = "\improper Storage Room"
 	},
 /turf/open/floor{
@@ -36745,8 +36747,8 @@ gOl
 gOl
 gOl
 tOc
-eUI
-mdK
+tOc
+fcJ
 mdK
 aeW
 bZf
@@ -36969,8 +36971,8 @@ fMc
 bFS
 fMc
 lDp
-eUI
-mdK
+faY
+iwh
 mdK
 hOD
 vLL