add: Ss1984update v3

code/__DEFINES/atom_hud.dm

@@ -88,6 +88,8 @@
 #define SECHUD_SYNDICATE "hudsyndicate"
 #define SECHUD_SYNDICATE_INTERDYNE "hudsyndicateinterdyne"
 #define SECHUD_SYNDICATE_INTERDYNE_HEAD "hudsyndicateinterdynehead"
+#define SECHUD_INTERDYNE_GREEN "hudinterdynegreen"
+#define SECHUD_INTERDYNE_GREEN_HEAD "hudinterdynegreenhead"
 
 #define SECHUD_ASSISTANT "hudassistant"
 #define SECHUD_ATMOSPHERIC_TECHNICIAN "hudatmospherictechnician"

code/game/machinery/recharger.dm

@@ -13,6 +13,7 @@
 	var/finished_recharging = FALSE
 
 	var/static/list/allowed_devices = typecacheof(list(
+		/obj/item/gun/microfusion,
 		/obj/item/gun/energy,
 		/obj/item/melee/baton/security,
 		/obj/item/ammo_box/magazine/recharge,

code/modules/bitrunning/bitrunoutfits.dm

@@ -4,6 +4,7 @@
 	shoes = /obj/item/clothing/shoes/sneakers/black
 	belt = /obj/item/bitrunning_host_monitor
 	id = /obj/item/card/id/advanced
+	back = /obj/item/storage/backpack
 
 /datum/outfit/bitrunning/cop
 	name = "alcoholic cop"
@@ -12,6 +13,7 @@
 	shoes = /obj/item/clothing/shoes/discoshoes
 	suit = /obj/item/clothing/suit/discoblazer
 	id = /obj/item/card/id/advanced
+	back = /obj/item/storage/backpack
 
 /datum/outfit/bitrunning/kim
 	name = "Kimball"
@@ -20,10 +22,12 @@
 	shoes = /obj/item/clothing/shoes/kim
 	suit = /obj/item/clothing/suit/kimjacket
 	id = /obj/item/card/id/advanced
+	back = /obj/item/storage/backpack
 
 /datum/outfit/bitrunning/mail
 	name = "Mailman"
 	head = /obj/item/clothing/head/costume/mailman
 	uniform = /obj/item/clothing/under/misc/mailman
 	shoes = /obj/item/clothing/shoes/sneakers/black
 	id = /obj/item/card/id/advanced
+	back = /obj/item/storage/backpack

code/modules/mob/living/silicon/ai/_preferences.dm

@@ -103,6 +103,7 @@ GLOBAL_LIST_INIT(ai_core_display_screens, sort_list(list(
 	"Triumvirate-M",
 	"Triumvirate",
 	"Weird",
+	"rat"
 )))
 
 /// A form of resolve_ai_icon that is guaranteed to never sleep.

code/modules/mod/modules/modules_security.dm

@@ -19,7 +19,7 @@
 /obj/item/mod/module/magnetic_harness/Initialize(mapload)
 	. = ..()
 	if(!guns_typecache)
-		guns_typecache = typecacheof(list(/obj/item/gun/ballistic, /obj/item/gun/energy, /obj/item/gun/grenadelauncher, /obj/item/gun/chem, /obj/item/gun/syringe))
+		guns_typecache = typecacheof(list(/obj/item/gun/ballistic, /obj/item/gun/energy, /obj/item/gun/grenadelauncher, /obj/item/gun/chem, /obj/item/gun/syringe,  /obj/item/gun/microfusion))
 
 /obj/item/mod/module/magnetic_harness/on_install()
 	var/obj/item/clothing/suit = mod.get_part_from_slot(ITEM_SLOT_OCLOTHING)

modular_nova/master_files/code/datums/id_trim/syndicate.dm

@@ -95,6 +95,7 @@
 	department_color = COLOR_LIME
 	subdepartment_color = COLOR_VERY_DARK_LIME_GREEN
 	threat_modifier = 2 // Interdyne is allowed on station, so this'll get beepskys off them.
+	sechud_icon_state = SECHUD_INTERDYNE_GREEN
 
 /datum/id_trim/syndicom/nova/interdyne/shaftminer
 	assignment = "Interdyne Shaft Miner"
@@ -104,3 +105,4 @@
 	trim_state = "trim_deckofficer"
 	department_color = COLOR_VERY_DARK_LIME_GREEN
 	access = list(ACCESS_SYNDICATE, ACCESS_ROBOTICS, ACCESS_SYNDICATE_LEADER)
+	sechud_icon_state = SECHUD_INTERDYNE_GREEN_HEAD

modular_nova/modules/blueshield/code/blueshield.dm

@@ -88,19 +88,20 @@
 	name ="modified hellfire laser gun"
 	desc = "A lightly overtuned version of NT's Hellfire Laser rifle, scratches showing its age and the fact it has definitely been owned before. This one is more energy efficient without sacrificing damage."
 	icon_state = "hellgun"
+	pin = /obj/item/firing_pin/implant/mindshield
 	ammo_type = list(/obj/item/ammo_casing/energy/laser/hellfire/blueshield)
 
 /obj/item/choice_beacon/blueshield
 	name = "gunset beacon"
 	desc = "A single use beacon to deliver a gunset of your choice. Please only call this in your office"
-	company_source = "Sol Defense Contracting"
+	company_source = "Sol and Nanotrasen collaboration in defense"
 	company_message = span_bold("Supply Pod incoming, please stand by.")
 
 /obj/item/choice_beacon/blueshield/generate_display_names()
 	var/static/list/selectable_gun_types = list(
 		"Takbok Revolver Set" = /obj/item/storage/toolbox/guncase/nova/pistol/trappiste_small_case/takbok,
 		"Custom Hellfire Laser Rifle" = /obj/item/gun/energy/laser/hellgun/blueshield,
-		"Bogseo Submachinegun Gunset" = /obj/item/storage/toolbox/guncase/nova/xhihao_large_case/bogseo,
+		"Blueshield's CMG-2 Gunset" = /obj/item/storage/toolbox/guncase/nova/blueshield_cmg,
 	)
 
 	return selectable_gun_types

modular_nova/modules/events/code/event_spawner.dm

@@ -1,6 +1,7 @@
 /obj/character_event_spawner
 	icon = 'modular_nova/modules/cryosleep/icons/cryogenics.dmi'
 	icon_state = "cryopod"
+	anchored = 1
 
 	var/list/species_whitelist
 	var/list/gender_whitelist
@@ -13,7 +14,7 @@
 	var/flavor_text = ""
 	var/list/additional_equipment
 	var/disappear_after_spawn
-	var/infinite = TRUE
+	var/infinite = FALSE
 	var/used = FALSE
 
 /obj/character_event_spawner/attack_ghost(mob/user)

modular_nova/modules/gunhud/code/gun_hud_component.dm

@@ -166,6 +166,43 @@
 				oth_h = "h9"
 		hud.set_hud(backing_color, oth_o, oth_t, oth_h, indicator)
 
+	else if(istype(parent, /obj/item/gun/microfusion))
+		var/obj/item/gun/microfusion/parent_gun = parent
+		if(!parent_gun.phase_emitter)
+			hud.icon_state = "microfusion_counter_no_emitter"
+			hud.maptext = null
+			return
+		if(parent_gun.phase_emitter.damaged)
+			hud.icon_state = "microfusion_counter_damaged"
+			hud.maptext = null
+			return
+		if(!parent_gun.cell)
+			hud.icon_state = "microfusion_counter_no_emitter"
+			hud.maptext = null
+			return
+		if(!parent_gun.cell.charge)
+			hud.icon_state = "microfusion_counter_no_emitter"
+			hud.maptext = null
+			return
+		var/phase_emitter_state = parent_gun.phase_emitter.get_heat_icon_state()
+		hud.icon_state = "microfusion_counter_[phase_emitter_state]"
+		hud.cut_overlays()
+		hud.maptext_x = -12
+		var/obj/item/ammo_casing/energy/shot = parent_gun.microfusion_lens
+		var/battery_percent = FLOOR(clamp(parent_gun.cell.charge / parent_gun.cell.maxcharge, 0, 1) * 100, 1)
+		var/shot_cost_percent = FLOOR(clamp(shot.e_cost / parent_gun.cell.maxcharge, 0, 1) * 100, 1)
+		if(battery_percent > 99 || shot_cost_percent > 99)
+			hud.maptext_x = -12
+		else
+			hud.maptext_x = -8
+		if(!parent_gun.can_shoot())
+			hud.icon_state = "microfusion_counter_no_emitter"
+			return
+		if(battery_percent <= 25)
+			hud.maptext = span_maptext("<div align='center' valign='middle' style='position:relative'><font color='[COLOR_YELLOW]'>[battery_percent]%</font><br><font color='[COLOR_CYAN]'>[shot_cost_percent]%</font></div>")
+			return
+		hud.maptext = span_maptext("<div align='center' valign='middle' style='position:relative'><font color='[COLOR_VIBRANT_LIME]'>[battery_percent]%</font><br><font color='[COLOR_CYAN]'>[shot_cost_percent]%</font></div>")
+
 /obj/item/gun/ballistic/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/ammo_hud)

modular_nova/modules/kahraman_equipment/code/clothing/armor_datums.dm

@@ -28,3 +28,14 @@
 	fire = 100
 	acid = ARMOR_LEVEL_MID
 	wound = WOUND_ARMOR_WEAK
+
+/datum/armor/colonist_mask
+	melee = ARMOR_LEVEL_TINY
+	bullet = ARMOR_LEVEL_TINY
+	laser = 5
+	energy = ARMOR_LEVEL_WEAK
+	bomb = ARMOR_LEVEL_MID
+	bio = 100
+	fire = 100
+	acid = ARMOR_LEVEL_MID
+	wound = WOUND_ARMOR_WEAK

modular_nova/modules/kahraman_equipment/code/clothing/clothing.dm

@@ -206,6 +206,7 @@
 	worn_icon_digi = 'modular_nova/modules/kahraman_equipment/icons/clothes/clothing_worn_digi.dmi'
 	worn_icon_teshari = 'modular_nova/modules/kahraman_equipment/icons/clothes/clothing_worn_teshari.dmi'
 	worn_icon_state = "mask"
+	armor_type = /datum/armor/colonist_mask
 	flags_inv = HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDESNOUT
 
 /obj/item/clothing/mask/gas/atmos/frontier_colonist/Initialize(mapload)