initial

cmss13-devs · Aug 13, 2024 · 884ff13 · 884ff13
1 parent 4bdd59b
commit 884ff13
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/code/modules/cm_marines/equipment/mortar/mortars.dm b/code/modules/cm_marines/equipment/mortar/mortars.dm
@@ -43,6 +43,17 @@
 	targ_y = deobfuscate_y(0)
 	internal_camera = new(loc)
 
+	var/new_icon_state
+	switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+		if("classic")
+			icon_state = new_icon_state ? new_icon_state : "c_" + icon_state
+		if("desert")
+			icon_state = new_icon_state ? new_icon_state : "d_" + icon_state
+		if("snow")
+			icon_state = new_icon_state ? new_icon_state : "s_" + icon_state
+		if("urban")
+			icon_state = new_icon_state ? new_icon_state : "u_" + icon_state
+
 /obj/structure/mortar/Destroy()
 	QDEL_NULL(internal_camera)
 	return ..()
@@ -400,6 +411,10 @@
 	unacidable = TRUE
 	w_class = SIZE_HUGE //No dumping this in a backpack. Carry it, fatso
 
+/obj/item/mortar_kit/Initialize(...)
+	. = ..()
+	select_gamemode_skin(type)
+
 /obj/item/mortar_kit/ex_act(severity)
 	switch(severity)
 		if(EXPLOSION_THRESHOLD_MEDIUM to INFINITY)

diff --git a/icons/obj/structures/mortar.dmi b/icons/obj/structures/mortar.dmi