Merge branch 'master' of https://github.com/Kirshbia/PvE-CMSS13

cmss13-devs · Mar 14, 2024 · 1c3bbb9 · 1c3bbb9
2 parents 7b111e7 + 414d726
commit 1c3bbb9
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 4 deletions.
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
@@ -608,6 +608,9 @@
 	new /obj/item/ammo_magazine/smartgun(src)
 	new /obj/item/ammo_magazine/smartgun(src)
 
+/obj/item/storage/belt/marine/smartgunner/standard
+	has_gamemode_skin = FALSE
+
 /obj/item/storage/belt/marine/quackers
 	name = "Mr. Quackers"
 	desc = "What are we going to do today, Mr. Quackers?"
@@ -1640,6 +1643,9 @@
 	)
 	has_gamemode_skin = TRUE
 
+/obj/item/storage/belt/gun/smartgunner/standard
+	has_gamemode_skin = FALSE
+
 /obj/item/storage/belt/gun/smartgunner/full/fill_preset_inventory()
 	handle_item_insertion(new /obj/item/weapon/gun/pistol/m4a3())
 	new /obj/item/ammo_magazine/pistol/hp(src)

diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -146,6 +146,23 @@
 	new /obj/item/storage/belt/marine/smartgunner(src)
 	new /obj/item/storage/belt/gun/smartgunner(src)
 
+/obj/structure/closet/secure_closet/smartgunner_forecon
+	name = "smartgunner locker"
+	desc = "A secure storage unit for a smartgunner."
+	req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_SMARTPREP)
+
+/obj/structure/closet/secure_closet/smartgunner_forecon/Initialize()
+	. = ..()
+	new /obj/item/weapon/gun/smartgun(src)
+	new /obj/item/smartgun_battery(src)
+	new /obj/item/clothing/suit/storage/marine/smartgunner/standard(src)
+	new /obj/item/ammo_magazine/smartgun(src)
+	new /obj/item/ammo_magazine/smartgun(src)
+	new /obj/item/ammo_magazine/smartgun(src)
+	new /obj/item/ammo_magazine/smartgun(src)
+	new /obj/item/storage/belt/marine/smartgunner/standard(src)
+	new /obj/item/storage/belt/gun/smartgunner/standard(src)
+
 /obj/structure/closet/cryo/Initialize()
 	. = ..()
 	new /obj/item/clothing/under/marine(src)

diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm
@@ -435,6 +435,9 @@
 
 	UnregisterSignal(user, COMSIG_HUMAN_ATTEMPTING_EQUIP)
 
+/obj/item/clothing/suit/storage/marine/smartgunner/standard
+	flags_atom = NO_SNOW_TYPE
+
 /obj/item/clothing/suit/storage/marine/leader
 	name = "\improper B12 pattern marine armor"
 	desc = "A lightweight suit of carbon fiber body armor built for quick movement. Designed in a lovely forest green. Use it to toggle the built-in flashlight."

diff --git a/maps/map_files/chapaev/chapaev.dmm b/maps/map_files/chapaev/chapaev.dmm
@@ -1434,7 +1434,11 @@
 /area/golden_arrow/engineering)
 "ob" = (
 /obj/structure/surface/table/reinforced/almayer_B,
-/obj/structure/machinery/faxmachine/uscm/command/capt,
+/obj/structure/machinery/faxmachine{
+	name = "\improper UPP Military Fax Machine";
+	network = "UPP Encrypted Network";
+	target_department = "UPP High Command"
+	},
 /turf/open/floor/strata{
 	icon_state = "floor2"
 	},

diff --git a/maps/map_files/rover/rover.dmm b/maps/map_files/rover/rover.dmm
@@ -68,9 +68,9 @@
 /turf/open/space/basic,
 /area/golden_arrow/canteen)
 "aC" = (
-/obj/structure/closet/secure_closet/smartgunner{
-	req_access_txt = "14;39";
-	req_one_access = list()
+/obj/structure/closet/secure_closet/smartgunner_forecon{
+	req_one_access = list();
+	req_access_txt = "14;39"
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/squad_one)