Huge Pile of Content [Turrets, Dartgun, PMC, etc]

code/__DEFINES/~RUtgmc_defines/calibers.dm

@@ -1,2 +1,6 @@
 #define CALIBER_44LS ".44 Long Special"
 #define CALIBER_500 ".500 Nigro Express"
+#define CALIBER_40ACP ".40 ACP"
+#define CALIBER_40ACPL ".40 ACPL"
+#define CALIBER_9X18 "9x18mm"
+#define CALIBER_DART "dart"

code/__DEFINES/~RUtgmc_defines/loadout.dm

@@ -2,6 +2,7 @@
 
 GLOBAL_LIST_INIT(engineer_gear_listed_products, list(
 		/obj/effect/vendor_bundle/engi = list(CAT_ESS, "Essential Engineer Set", 0, "white"),
+		/obj/item/engi_upgrade_kit = list(CAT_ENGSUP, "Sentry Upgrade Kit", 15, "blue"),
 		/obj/item/stack/sheet/metal/small_stack = list(CAT_ENGSUP, "Metal x10", METAL_PRICE_IN_GEAR_VENDOR, "orange"),
 		/obj/item/stack/sheet/plasteel/small_stack = list(CAT_ENGSUP, "Plasteel x10", PLASTEEL_PRICE_IN_GEAR_VENDOR, "orange"),
 		/obj/item/stack/sandbags_empty/half = list(CAT_ENGSUP, "Sandbags x25", SANDBAG_PRICE_IN_GEAR_VENDOR, "orange"),
@@ -11,7 +12,6 @@ GLOBAL_LIST_INIT(engineer_gear_listed_products, list(
 		/obj/item/explosive/plastique = list(CAT_ENGSUP, "Plastique explosive", 2, "orange3"),
 		/obj/item/explosive/plastique/genghis_charge = list(CAT_ENGSUP, "EX-62 Genghis incendiary charge", 6, "orange3"),
 		/obj/item/detpack = list(CAT_ENGSUP, "Detonation pack", 2, "orange3"),
-		/obj/item/storage/box/crate/minisentry = list(CAT_ENGSUP, "ST-580 point defense sentry kit", 45, "blue"),
 		/obj/structure/closet/crate/uav_crate = list(CAT_ENGSUP, "Iguana Unmanned Vehicle", 50, "blue"),
 		/obj/effect/teleporter_linker = list(CAT_ENGSUP, "Teleporters", 25, "blue"),
 		/obj/item/tool/pickaxe/plasmacutter = list(CAT_ENGSUP, "Plasma cutter", 23, "blue"),
@@ -70,6 +70,21 @@ GLOBAL_LIST_INIT(medic_gear_listed_products, list(
 	/obj/item/defibrillator/gloves = list(CAT_MEDSUP, "Advanced medical gloves", 4, "yellow"),
 	/obj/item/tweezers_advanced = list(CAT_MEDSUP, "Advanced Tweezers", 8, "yellow"),
 	/obj/effect/vendor_bundle/stretcher = list(CAT_MEDSUP, "Medivac Stretcher", 16, "yellow"),
+	/obj/item/storage/ai2 = list(CAT_MEDSUP, "\"АИ\"-2 first aid kit", 16, "cyan"),
+	/obj/item/deployable_optable = list(CAT_MEDSUP, "Deployable Operating Table", 16, "yellow"),
+	/obj/item/storage/holster/belt/dartgun/full = list(CAT_MEDSUP, "DP-2 Dart Gun belt", 8, "blue"),
+	/obj/item/storage/dartbox/hypervene =     list(CAT_MEDSUP, "Hypervene Dart Box", 2, "orange2"),
+	/obj/item/storage/dartbox/tramadol =      list(CAT_MEDSUP, "Tramadol Dart Box", 2, "orange2"),
+	/obj/item/storage/dartbox/dylovene =      list(CAT_MEDSUP, "Dylovene Dart Box", 2, "orange2"),
+	/obj/item/storage/dartbox/bicaridine =    list(CAT_MEDSUP, "Bicaridine Dart Box", 4, "orange2"),
+	/obj/item/storage/dartbox/kelotane =      list(CAT_MEDSUP, "Kelotane Dart Box", 4, "orange2"),
+	/obj/item/storage/dartbox/tricordrazine = list(CAT_MEDSUP, "Tricordrazine Dart Box", 4, "orange2"),
+	/obj/item/storage/dartbox/inaprovaline =  list(CAT_MEDSUP, "Inaprovaline Dart Box", 6, "orange2"),
+	/obj/item/storage/dartbox/combat =        list(CAT_MEDSUP, "Combat Dart Box", 10, "orange2"),
+	/obj/item/storage/dartbox/synaptizine =   list(CAT_MEDSUP, "Synaptizine Dart Box", 12, "orange2"),
+	/obj/item/storage/dartbox/russian_red =   list(CAT_MEDSUP, "Russian Red Dart Box", 12, "orange2"),
+	/obj/item/storage/dartbox/meraderm =      list(CAT_MEDSUP, "Meraderm Dart Box", 16, "orange2"),
+	/obj/item/storage/dartbox/neuraline =     list(CAT_MEDSUP, "Neuraline Dart Box", 24, "orange2"),
 ))
 
 //A way to give them everything at once that still works with loadouts would be nice, but barring that make sure that your point calculation is set up so they don't get more than what they're supposed to
@@ -147,6 +162,7 @@ GLOBAL_LIST_INIT(leader_gear_listed_products, list(
 	/obj/item/ammo_magazine/rifle/tx54/smoke = list(CAT_LEDSUP, "GL-54 tactical smoke Magazine for AR-55/GL-54", 1, "orange2"),
 	/obj/item/ammo_magazine/rifle/tx54/smoke/tangle = list(CAT_LEDSUP, "GL-54 Tanglefoot Magazine for AR-55/GL-54", 3, "orange2"),
 	/obj/item/cell/lasgun/lasrifle/recharger = list(CAT_LEDSUP, "Terra Experimental recharger battery", 4, "orange2"),
+	/obj/item/storage/ai2 = list(CAT_LEDSUP, "\"АИ\"-2 first aid kit", 12, "cyan"),
 	/obj/item/storage/firstaid/adv = list(CAT_LEDSUP, "Advanced firstaid kit", 1, "cyan"),
 	/obj/item/reagent_containers/hypospray/autoinjector/synaptizine = list(CAT_LEDSUP, "Injector (Synaptizine)", 2, "cyan"),
 	/obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = list(CAT_LEDSUP, "Injector (Advanced)", 2, "cyan"),
@@ -227,10 +243,12 @@ GLOBAL_LIST_INIT(commander_gear_listed_products, list(
 	/obj/item/tool/pickaxe/plasmacutter = list(CAT_FCSUP, "Plasma cutter", 23, "yellow"),
 	/obj/item/clothing/glasses/welding/superior = list(CAT_FCSUP, "Superior welding goggles", 2, "yellow"),
 	/obj/item/armor_module/module/welding/superior = list(CAT_FCSUP, "Superior welding module", 2, "yellow"),
-	/obj/item/storage/box/crate/minisentry = list(CAT_FCSUP, "ST-580 point defense sentry kit", 15, "yellow"),
+	/obj/item/weapon/gun/sentry/big_sentry = list(CAT_FCSUP, "ST-BASIC point defense sentry", 15, "yellow"),
+	/obj/item/engi_upgrade_kit = list(CAT_FCSUP, "Sentry Upgrade Kit", 5, "yellow"),
 	/obj/item/healthanalyzer/gloves = list(CAT_FCSUP, "Health scanner gloves", 2, "yellow"),
 	/obj/item/defibrillator/gloves = list(CAT_FCSUP, "Advanced medical gloves", 4, "yellow"),
 	/obj/item/storage/pouch/medical_injectors/medic = list(CAT_FCSUP, "Advanced Injector Pouch", 16, "cyan"),
+	/obj/item/storage/ai2 = list(CAT_FCSUP, "\"АИ\"-2 first aid kit", 12, "cyan"),
 	/obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = list(CAT_FCSUP, "Injector (Peridaxon Plus)", 4, "cyan"),
 	/obj/item/reagent_containers/hypospray/autoinjector/dexalinplus = list(CAT_FCSUP, "Injector (Dexalin Plus)", 1, "cyan"),
 	/obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = list(CAT_FCSUP, "Injector (Quick-Clot Plus)", 4, "cyan"),
@@ -255,7 +273,8 @@ GLOBAL_LIST_INIT(synthetic_gear_listed_products, list(
 	/obj/item/tool/weldingtool/hugetank = list(CAT_SYNTH, "High-capacity industrial blowtorch", 5, "orange"),
 	/obj/item/explosive/plastique = list(CAT_SYNTH, "Plastique explosive", 2, "orange3"),
 	/obj/item/explosive/plastique/genghis_charge = list(CAT_SYNTH, "EX-62 Genghis incendiary charge", 6, "orange3"),
-	/obj/item/storage/box/crate/minisentry = list(CAT_SYNTH, "ST-580 point defense sentry kit", 30, "blue"),
+	/obj/item/weapon/gun/sentry/big_sentry = list(CAT_SYNTH, "ST-BASIC point defense sentry", 30, "blue"),
+	/obj/item/engi_upgrade_kit = list(CAT_SYNTH, "Sentry Upgrade Kit", 15, "blue"),
 	/obj/effect/teleporter_linker = list(CAT_SYNTH, "Teleporters", 15, "blue"),
 	/obj/item/tool/pickaxe/plasmacutter = list(CAT_SYNTH, "Plasma cutter", 15, "blue"),
 	/obj/item/attachable/buildasentry = list(CAT_SYNTH, "Build-A-Sentry Attachment", 30, "blue"),
@@ -287,6 +306,8 @@ GLOBAL_LIST_INIT(synthetic_gear_listed_products, list(
 	/obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = list(CAT_SYNTH, "Injector (Advanced)", 2, "cyan"),
 	/obj/item/reagent_containers/hypospray/autoinjector/synaptizine = list(CAT_SYNTH, "Injector (Synaptizine)", 2, "cyan"),
 	/obj/item/reagent_containers/hypospray/autoinjector/neuraline = list(CAT_SYNTH, "Injector (Neuraline)", 7, "cyan"),
+	/obj/item/storage/ai2 = list(CAT_SYNTH, "\"АИ\"-2 first aid kit", 8, "cyan"),
+	/obj/item/deployable_optable = list(CAT_SYNTH, "Deployable Operating Table", 12, "yellow"),
 	/obj/item/healthanalyzer/gloves = list(CAT_SYNTH, "Health scanner gloves", 2, "yellow"),
 	/obj/item/defibrillator/gloves = list(CAT_SYNTH, "Advanced medical gloves", 4, "yellow"),
 	/obj/item/tweezers_advanced = list(CAT_SYNTH, "Advanced Tweezers", 8, "yellow"),

code/__DEFINES/~RUtgmc_defines/loadout_variants.dm

@@ -2,6 +2,7 @@
 #define CAPE_REGALY "cape_regaly"
 #define CAPE_ONELONG "cape_onelong"
 
+/* RUTGMS EDIT
 GLOBAL_LIST_INIT(loadout_variant_keys, list(
 	CAPE_KAMA = "kama",
 	CAPE_KILT = "kilt",
@@ -17,3 +18,24 @@ GLOBAL_LIST_INIT(loadout_variant_keys, list(
 	MARK_ONE_WEBBING = "webbing",
 	SOM_BLACK = "black",
 ))
+*/
+
+GLOBAL_LIST_INIT(loadout_variant_keys, list(
+	CAPE_KAMA = "kama",
+	CAPE_KILT = "kilt",
+	CAPE_KILT_ALT = "kilt (alt)",
+	CAPE_LONG = "long",
+	CAPE_HIGHLIGHT_LONG_LINE = "long_line",
+	CAPE_HIGHLIGHT_LONG_ARROW = "long_arrow",
+	CAPE_HIGHLIGHT_LONG_SKULL = "long_skull",
+	CAPE_HIGHLIGHT_LONG_MEDIC = "long_medic",
+	CAPE_REGALY = "regaly",
+	CAPE_ONELONG = "onelong",
+	CAPE_HIGHLIGHT_NONE = "none",
+	NORMAL = "normal", // just so it doesn't cause runtimes even when don't use it
+	CAPE_HIGHLIGHT_NORMAL_ALT = "normal (alt)",
+	MARK_FIVE_WEBBING = "webbing",
+	MARK_THREE_WEBBING = "webbing",
+	MARK_ONE_WEBBING = "webbing",
+	SOM_BLACK = "black",
+))

code/_onclick/hud/screen_objects/menu_text_objects.dm

@@ -12,7 +12,7 @@
 	screen_loc = "CENTER"
 	maptext_height = 480
 	maptext_width = 480
-	maptext_x = 24
+	maptext_x = 29 //RUTGMC EDIT
 	maptext_y = 9
 
 
@@ -28,27 +28,35 @@
 ///Clickable UI lobby objects which do stuff on Click() when pressed
 /atom/movable/screen/text/lobby/clickable
 	maptext = "if you see this a coder was stinky"
-	icon = 'icons/UI_Icons/lobby_button.dmi' //hitbox prop
+	icon = 'modular_RUtgmc/icons/UI_Icons/lobby_button.dmi' //hitbox prop
 	mouse_opacity = MOUSE_OPACITY_ICON
 
 /atom/movable/screen/text/lobby/clickable/MouseEntered(location, control, params)
 	. = ..()
 	if(!(flags_atom & INITIALIZED)) //yes this can happen, fuck me
 		return
 	color = COLOR_ORANGE
+	icon_state += "_a" //RUTGMC ADDITION
 	var/mob/new_player/player = usr
-	player.playsound_local(player, 'sound/effects/menu_click.ogg', 50)
+	player.playsound_local(player, 'modular_RUtgmc/sound/effects/UI/move.ogg', 40) //RUTGMC EDIT
 
 /atom/movable/screen/text/lobby/clickable/MouseExited(location, control, params)
 	. = ..()
 	color = initial(color)
+	//RUTGMC ADDITION BEGIN
+	var/mob/new_player/player = hud.mymob
+	if(icon_state != "ready_a")
+		icon_state = initial(icon_state) //ORIGINAL
+	else
+		icon_state = player.ready ? "ready" : "unready"
+	//RUTGMC ADDITION END
 
 /atom/movable/screen/text/lobby/clickable/Click()
 	if(!(flags_atom & INITIALIZED)) //yes this can happen, fuck me
 		to_chat(usr, span_warning("The game is still setting up, please try again later."))
 		return
 	var/mob/new_player/player = usr
-	player.playsound_local(player, 'sound/effects/menu_select.ogg', 50)
+	player.playsound_local(player, 'modular_RUtgmc/sound/effects/UI/click.ogg', 60) //RUTGMC EDIT
 
 
 /atom/movable/screen/text/lobby/clickable/setup_character
@@ -101,6 +109,10 @@
 	var/mob/new_player/player = hud.mymob
 	player.toggle_ready()
 	icon_state = player.ready ? "ready" : "unready"
+	//RUTGMC ADDITION BEGIN
+	if(MouseEntered())
+		icon_state += "_a"
+	//RUTGMC ADDITION END
 	update_text()
 
 /atom/movable/screen/text/lobby/clickable/manifest
@@ -114,7 +126,7 @@
 
 /atom/movable/screen/text/lobby/clickable/xenomanifest
 	maptext = "<span class='maptext' style=font-size:8px>VIEW HIVE</span>"
-	icon_state = "manifest"
+	icon_state = "manifest_xeno"
 
 /atom/movable/screen/text/lobby/clickable/xenomanifest/Click()
 	. = ..()

code/_onclick/xeno.dm

@@ -9,6 +9,33 @@
 	if(HAS_TRAIT(src, TRAIT_HANDS_BLOCKED))
 		return
 
+	if(src.a_intent == INTENT_HELP)
+		var/fire_level_to_extinguish = 5
+		var/turf/target_turf = A
+		for(var/obj/flamer_fire/fire in target_turf)
+			if((fire.firelevel > fire_level_to_extinguish) && (fire.flame_color == "red")) //TODO: Make firetypes, colour types are terrible
+				fire.firelevel -= fire_level_to_extinguish
+				fire.updateicon()
+			else
+				switch(fire.flame_color)
+					if("blue") //no change cause it has bigger firelvl.
+						if(fire.firelevel > fire_level_to_extinguish)
+							fire.firelevel -= fire_level_to_extinguish
+							fire.updateicon()
+					if("green") //extinguishes faster.
+						if(fire.firelevel > 2*fire_level_to_extinguish)
+							fire.firelevel -= 2*fire_level_to_extinguish
+							fire.updateicon()
+						else
+							qdel(fire)
+					else
+						qdel(fire)
+			src.do_attack_animation(target_turf)
+			playsound(target_turf, 'sound/effects/alien_tail_swipe2.ogg', 45, 1) //SFX
+			src.visible_message(span_danger("\The [src] pats at the fire!"), \
+			span_danger("We pat the fire!"))
+			changeNext_move(CLICK_CD_MELEE)
+
 	var/atom/S = A.handle_barriers(src)
 	S.attack_alien(src, xeno_caste.melee_damage * xeno_melee_damage_modifier, isrightclick = islist(modifiers) ? modifiers["right"] : FALSE)
 	GLOB.round_statistics.xeno_unarmed_attacks++

code/datums/components/deployable_item.dm

@@ -82,6 +82,11 @@
 		if(user.do_actions)
 			user.balloon_alert(user, "You are already doing something!")
 			return
+		if(CHECK_BITFIELD(item_to_deploy?.near_lock, TRUE))
+			for(var/obj/machinery/deployable/def in urange(2, location))
+				if(def != src)
+					user.balloon_alert(user, "Too close to [def]!")
+					return
 		user.balloon_alert(user, "You start deploying...")
 		user.setDir(newdir) //Face towards deploy location for ease of deploy.
 		if(!do_after(user, deploy_time, NONE, item_to_deploy, BUSY_ICON_BUILD))
@@ -132,6 +137,7 @@
 /datum/component/deployable_item/proc/finish_undeploy(datum/source, mob/user)
 	var/obj/deployed_machine = source //The machinethat is undeploying should be the the one sending the Signal
 	var/obj/item/undeployed_item = deployed_machine.get_internal_item() //Item the machine is undeploying
+	var/obj/held_item = user.get_active_held_item() //Active hand item check
 
 	if(!undeployed_item)
 		CRASH("[src] is missing it's internal item.")
@@ -143,6 +149,9 @@
 	var/obj/machinery/deployable/mounted/sentry/sentry
 	if(istype(deployed_machine, /obj/machinery/deployable/mounted/sentry))
 		sentry = deployed_machine
+		if(!istype(held_item, /obj/item/tool/multitool)) // Can't undeploy without multitool in active hand
+			user.balloon_alert(user, "You need to hold a multitool!")
+			return
 	sentry?.set_on(FALSE)
 	user.balloon_alert(user, "You start disassembling [undeployed_item]")
 	if(!do_after(user, deploy_time, NONE, deployed_machine, BUSY_ICON_BUILD))

code/datums/emergency_calls/pmc.dm

@@ -32,24 +32,48 @@
 	print_backstory(H)
 
 	if(!leader)
-		leader = H
-		var/datum/job/J = SSjob.GetJobType(/datum/job/pmc/leader)
+		if(prob(70))
+			leader = H
+			var/datum/job/J = SSjob.GetJobType(/datum/job/pmc/leader)
+			H.apply_assigned_role_to_spawn(J)
+			to_chat(H, "<p style='font-size:1.5em'>[span_notice("You are the leader of this private military contractor team in responding to the TGMC distress signal sent out nearby. Address the situation and get your team to safety!")]</p>")
+			return
+		else
+			leader = H
+			var/datum/job/J = SSjob.GetJobType(/datum/job/pmc/leader_l)
+			H.apply_assigned_role_to_spawn(J)
+			to_chat(H, "<p style='font-size:1.5em'>[span_notice("You are the leader of this private military contractor team in responding to the TGMC distress signal sent out nearby. Address the situation and get your team to safety!")]</p>")
+			return
+
+	if(prob(20))
+		var/datum/job/J = SSjob.GetJobType(/datum/job/pmc/medic)
 		H.apply_assigned_role_to_spawn(J)
-		to_chat(H, "<p style='font-size:1.5em'>[span_notice("You are the leader of this private military contractor team in responding to the TGMC distress signal sent out nearby. Address the situation and get your team to safety!")]</p>")
+		to_chat(H, "<p style='font-size:1.5em'>[span_notice("You are a PMC medic assigned to this team to respond to the TGMC distress signal sent out nearby. Don't forget to heal your squad members!")]</p>")
 		return
 
-	if(prob(30))
+	if(prob(20))
 		var/datum/job/J = SSjob.GetJobType(/datum/job/pmc/gunner)
 		H.apply_assigned_role_to_spawn(J)
 		to_chat(H, "<p style='font-size:1.5em'>[span_notice("You are a PMC heavy gunner assigned to this team to respond to the TGMC distress signal sent out nearby. Be the back guard of your squad!")]</p>")
 		return
 
-	if(prob(30))
+	if(prob(20))
+		var/datum/job/J = SSjob.GetJobType(/datum/job/pmc/engineer)
+		H.apply_assigned_role_to_spawn(J)
+		to_chat(H, "<p style='font-size:1.5em'>[span_notice("You are a PMC engineer assigned to this team to respond to the TGMC distress signal sent out nearby. Support your squad with FLAMES!")]</p>")
+		return
+
+	if(prob(20))
 		var/datum/job/J = SSjob.GetJobType(/datum/job/pmc/sniper)
 		H.apply_assigned_role_to_spawn(J)
 		to_chat(H, "<p style='font-size:1.5em'>[span_notice("You are a PMC heavy sniper assigned to this team to respond to the TGMC distress signal sent out nearby. Support your squad with long ranged firepower!")]</p>")
 		return
 
-	var/datum/job/J = SSjob.GetJobType(/datum/job/pmc/standard)
-	H.apply_assigned_role_to_spawn(J)
-	to_chat(H, "<p style='font-size:1.5em'>[span_notice("You are a private military contractor assigned to this team to respond to the TGMC distress signal sent out nearby. Assist your team and protect NT's interests whenever possible!")]</p>")
+	if(prob(30))
+		var/datum/job/J = SSjob.GetJobType(/datum/job/pmc/standard)
+		H.apply_assigned_role_to_spawn(J)
+		to_chat(H, "<p style='font-size:1.5em'>[span_notice("You are a private military contractor assigned to this team to respond to the TGMC distress signal sent out nearby. Assist your team and protect NT's interests whenever possible!")]</p>")
+	else
+		var/datum/job/J = SSjob.GetJobType(/datum/job/pmc/standard_m)
+		H.apply_assigned_role_to_spawn(J)
+		to_chat(H, "<p style='font-size:1.5em'>[span_notice("You are a private military contractor assigned to this team to respond to the TGMC distress signal sent out nearby. Assist your team and protect NT's interests whenever possible!")]</p>")

code/datums/gamemodes/_game_mode.dm

@@ -806,7 +806,7 @@ GLOBAL_LIST_INIT(bioscan_locations, list(
 		A.show_roundend_report(owner.client, PERSONAL_LAST_ROUND)
 
 /client/proc/roundend_report_file()
-	return "data/[ckey].html"
+	return "data/endgameckey/[ckey].html" //RUTGMC EDIT /endgameckey
 
 /datum/game_mode/proc/announce_xenomorphs()
 	var/list/parts = list()

code/datums/gamemodes/campaign/rewards/campaign_asset_jobs.dm

@@ -504,7 +504,7 @@ What you lack in equipment and military training you make up in bravery and conv
 //PMC
 /datum/job/pmc/standard/campaign_bonus
 	faction = FACTION_TERRAGOV
-	comm_title = "PMC"
+	comm_title = "PMC-ST" //RUTGMC EDIT
 	job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_BOLD_NAME_ON_SELECTION|JOB_FLAG_PROVIDES_SQUAD_HUD|JOB_FLAG_CAN_SEE_ORDERS
 	job_cost = 0
 	outfit = /datum/outfit/job/pmc/standard/campaign
@@ -514,7 +514,7 @@ What you lack in equipment and military training you make up in bravery and conv
 
 /datum/job/pmc/gunner/campaign_bonus
 	faction = FACTION_TERRAGOV
-	comm_title = "PMC"
+	comm_title = "PMC-SG" //RUTGMC EDIT
 	job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_BOLD_NAME_ON_SELECTION|JOB_FLAG_PROVIDES_SQUAD_HUD|JOB_FLAG_CAN_SEE_ORDERS
 	job_cost = 0
 	outfit = /datum/outfit/job/pmc/gunner/campaign
@@ -524,7 +524,7 @@ What you lack in equipment and military training you make up in bravery and conv
 
 /datum/job/pmc/leader/campaign_bonus
 	faction = FACTION_TERRAGOV
-	comm_title = "PMC"
+	comm_title = "PMC-LD" //RUTGMC EDIT
 	job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_BOLD_NAME_ON_SELECTION|JOB_FLAG_PROVIDES_SQUAD_HUD|JOB_FLAG_CAN_SEE_ORDERS
 	job_cost = 0
 	outfit = /datum/outfit/job/pmc/leader/campaign

code/datums/jobs/job/pmc.dm

@@ -1,10 +1,12 @@
+/* RUTGMC MOVED TO MODULE
 /datum/job/pmc
 	job_category = JOB_CAT_MARINE
 	access = ALL_PMC_ACCESS
 	minimal_access = ALL_PMC_ACCESS
 	skills_type = /datum/skills/pmc
 	faction = FACTION_NANOTRASEN
 	minimap_icon = "pmc"
+	comm_title = "PMC"
 
 
 //PMC Standard
@@ -241,3 +243,4 @@
 	H.equip_to_slot_or_del(new /obj/item/explosive/grenade/impact, SLOT_IN_R_POUCH)
 	H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/drain, SLOT_IN_R_POUCH)
 	H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH)
+*/

code/game/objects/items/explosives/grenades/grenade.dm

@@ -85,11 +85,12 @@
 	addtimer(CALLBACK(src, PROC_REF(prime)), det_time)
 	return TRUE
 
+/* RUTGMC MOVED TO MODULE
 /obj/item/explosive/grenade/update_overlays()
 	. = ..()
 	if(active && dangerous)
 		. += new /obj/effect/overlay/danger
-
+*/
 
 /obj/item/explosive/grenade/proc/prime()
 	explosion(loc, light_impact_range = src.light_impact_range, weak_impact_range = src.weak_impact_range)

code/game/objects/items/storage/pouch.dm

@@ -625,7 +625,7 @@
 	desc = "An eye catching white medical pouch capable of holding all your surgical tools."
 	icon_state = "surgery"
 	sprite_slots = 1
-	storage_slots = 12
+	storage_slots = 11 //RUTGMC EDIT 12 -> 11
 	max_storage_space = 24
 	can_hold = list(
 		/obj/item/tool/surgery,