Ports Microfusion Energy Guns

code/__DEFINES/atom_hud.dm

@@ -46,10 +46,12 @@
 /// Mech camera HUD
 #define DIAG_CAMERA_HUD "22"
 
+//monkestation edit start
 #define NANITE_HUD "23"
 #define DIAG_NANITE_FULL_HUD "24"
 // for gun permit
 #define PERMIT_HUD "25"
+//monkestation edit end
 
 //by default everything in the hud_list of an atom is an image
 //a value in hud_list with one of these will change that behavior
@@ -67,7 +69,7 @@
 #define DATA_HUD_SENTIENT_DISEASE 8
 #define DATA_HUD_AI_DETECT 9
 #define DATA_HUD_FAN 10
-#define DATA_HUD_PERMIT 11
+#define DATA_HUD_PERMIT 11 //monkestation edit
 
 // Notification action types
 #define NOTIFY_JUMP "jump"

code/__DEFINES/inventory.dm

@@ -172,6 +172,7 @@ GLOBAL_LIST_INIT(detective_vest_allowed, list(
 	/obj/item/flashlight,
 	/obj/item/gun/ballistic,
 	/obj/item/gun/energy,
+	/obj/item/gun/microfusion, //monkestation edit
 	/obj/item/lighter,
 	/obj/item/melee/baton,
 	/obj/item/reagent_containers/spray/pepper,
@@ -191,6 +192,7 @@ GLOBAL_LIST_INIT(security_vest_allowed, list(
 	/obj/item/flashlight,
 	/obj/item/gun/ballistic,
 	/obj/item/gun/energy,
+	/obj/item/gun/microfusion, //monkestation edit
 	/obj/item/knife/combat,
 	/obj/item/melee/baton,
 	/obj/item/reagent_containers/spray/pepper,
@@ -208,6 +210,7 @@ GLOBAL_LIST_INIT(security_wintercoat_allowed, list(
 	/obj/item/ammo_casing,
 	/obj/item/gun/ballistic,
 	/obj/item/gun/energy,
+	/obj/item/gun/microfusion, //monkestation edit
 	/obj/item/melee/baton,
 	/obj/item/reagent_containers/spray/pepper,
 	/obj/item/restraints/handcuffs,

code/__DEFINES/~monkestation/armaments.dm

@@ -0,0 +1,43 @@
+// Armament categories
+#define ARMAMENT_CATEGORY_STANDARD "Standard Equipment"
+#define ARMAMENT_CATEGORY_STANDARD_LIMIT 1
+
+// Armament subcategories
+#define ARMAMENT_SUBCATEGORY_NONE "Uncategorised"
+
+/// To identify the limit of the category type in the associative list. Techical stuff.
+#define CATEGORY_LIMIT "Category Limit"
+#define CATEGORY_ENTRY "Category Entry"
+
+// All the categories
+#define ARMAMENT_CATEGORY_MELEE "Melee Weapons"
+#define ARMAMENT_CATEGORY_MELEE_LIMIT 1
+#define ARMAMENT_CATEGORY_PRIMARY "Primary Weapons"
+#define ARMAMENT_CATEGORY_PRIMARY_LIMIT 1
+#define ARMAMENT_CATEGORY_SECONDARY "Secondary Weapons"
+#define ARMAMENT_CATEGORY_SECONDARY_LIMIT 1
+#define ARMAMENT_CATEGORY_ARMOR_HEAD "Headgear"
+#define ARMAMENT_CATEGORY_ARMOR_HEAD_LIMIT 1
+#define ARMAMENT_CATEGORY_MEDICAL "Medical Supplies"
+#define ARMAMENT_CATEGORY_MEDICAL_LIMIT 5
+
+
+// All the subcategories
+#define ARMAMENT_SUBCATEGORY_AMMO "Ammunition"
+#define ARMAMENT_SUBCATEGORY_MELEE_LETHAL "Lethal Weaponry"
+#define ARMAMENT_SUBCATEGORY_MELEE_NONLETHAL "Non-Lethal Weaponry"
+#define ARMAMENT_SUBCATEGORY_SUBMACHINEGUN "Submachine Guns"
+#define ARMAMENT_SUBCATEGORY_ASSAULTRIFLE "Assault Rifles"
+#define ARMAMENT_SUBCATEGORY_SPECIAL "Special Weapons"
+#define ARMAMENT_SUBCATEGORY_PISTOL "Pistols"
+#define ARMAMENT_SUBCATEGORY_HELMET "Helmets"
+#define ARMAMENT_SUBCATEGORY_BERETS "Berets"
+#define ARMAMENT_SUBCATEGORY_MEDKIT "Medkits"
+#define ARMAMENT_SUBCATEGORY_INJECTOR "Injectors"
+#define ARMAMENT_SUBCATEGORY_SHOTGUN "Shotguns"
+#define ARMAMENT_SUBCATEGORY_LASER "Laser Weaponry"
+#define ARMAMENT_SUBCATEGORY_ARMOR "Armor"
+#define ARMAMENT_SUBCATEGORY_GUNPART "Gun Parts"
+#define ARMAMENT_SUBCATEGORY_EMITTER "Phase Emitter"
+#define ARMAMENT_SUBCATEGORY_CELL_UPGRADE "Cell Upgrade"
+#define ARMAMENT_SUBCATEGORY_CHEMICAL "Chemicals"

code/__DEFINES/~monkestation/cargo_import_companies.dm

@@ -0,0 +1,28 @@
+// Bitflags for what company a cargo order datum should belong to
+#define CARGO_COMPANY_NAKAMURA_MODSUITS (1<<0)
+#define CARGO_COMPANY_BLACKSTEEL (1<<1)
+#define CARGO_COMPANY_NRI_SURPLUS (1<<2)
+#define CARGO_COMPANY_DEFOREST (1<<3)
+#define CARGO_COMPANY_DONK (1<<4)
+#define CARGO_COMPANY_KAHRAMAN (1<<5)
+#define CARGO_COMPANY_NAKAMURA_TOOLING (1<<6)
+#define CARGO_COMPANY_SOL_DEFENSE (1<<7)
+#define CARGO_COMPANY_MICROSTAR (1<<8)
+#define CARGO_COMPANY_VITEZSTVI_AMMO (1<<9)
+
+// Company names, because the armament category and company name need to be the exact same, so use defines like this
+#define NAKAMURA_ENGINEERING_MODSUITS_NAME "Nakamura Engineering MOD Divison"
+#define BLACKSTEEL_FOUNDATION_NAME "Jarnsmiour Blacksteel Foundation"
+#define NRI_SURPLUS_COMPANY_NAME "Izlishek Company Military Supplier"
+#define DEFOREST_MEDICAL_NAME "DeForest Medical Corporation"
+#define DONK_CO_NAME "Donk Corporation"
+#define KAHRAMAN_INDUSTRIES_NAME "Kahraman Heavy Industries"
+#define NAKAMURA_ENGINEERING_TOOLING_NAME "Nakamura Engineering Tooling Divison"
+#define SOL_DEFENSE_DEFENSE_NAME "Sol Defense Imports"
+#define MICROSTAR_ENERGY_NAME "MicroStar Energy Weapon Coalition"
+#define VITEZSTVI_AMMO_NAME "Vitezstvi Ammo & Weapon Accessories"
+
+#define COMPANY_INTEREST_GAIN_BIG 10
+#define COMPANY_INTEREST_GAIN_AVERAGE 5
+#define COMPANY_INTEREST_GAIN_LOW 3
+#define COMPANY_INTEREST_GAIN_PITIFUL 1

code/__DEFINES/~monkestation/gun.dm

@@ -0,0 +1,23 @@
+#define SELECT_SEMI_AUTOMATIC 1
+#define SELECT_BURST_SHOT 2
+#define SELECT_FULLY_AUTOMATIC 3
+
+// Bitflags for what company produces the gun
+#define COMPANY_CANTALAN (1<<0)
+#define COMPANY_ARMADYNE (1<<1)
+#define COMPANY_SCARBOROUGH (1<<2)
+#define COMPANY_DONK (1<<3)
+#define COMPANY_BOLT (1<<4)
+#define COMPANY_OLDARMS (1<<5)
+#define COMPANY_IZHEVSK (1<<6)
+#define COMPANY_NANOTRASEN (1<<7)
+#define COMPANY_ALLSTAR (1<<8)
+#define COMPANY_MICRON (1<<9)
+#define COMPANY_DYNAMICS (1<<10)
+#define COMPANY_INTERDYNE (1<<12)
+
+#define COMPANY_INTEREST_GUN 10
+#define COMPANY_INTEREST_CHEMICAL 5
+#define COMPANY_INTEREST_ATTACHMENT 4
+#define COMPANY_INTEREST_AMMO_BULK 3
+#define COMPANY_INTEREST_AMMO 1

code/__DEFINES/~monkestation/manufacturer_strings.dm

@@ -0,0 +1,22 @@
+// Text for what examine blurb will come up when used with /datum/element/manufacturer_examine
+// Very loosely grouped based on what company makes what mainly for your viewing pleasure
+
+#define COMPANY_DONK "It has a <b>[span_green("Donk Corporation")]</b> label visible on it."
+#define COMPANY_BOLT "It has <b>[span_yellow("Bolt Fabrications")]</b> stamped onto it."
+#define COMPANY_NANOTRASEN "It has <b>[span_blue("Nanotrasen Armories")]</b> etched into it."
+
+#define COMPANY_CARWO "It has a small <b>[span_cyan("four pointed star")]</b> alongside <b>[span_cyan("Carwo Defense Systems")]</b> etched into it."
+#define COMPANY_TRAPPISTE "It has a small <b>[span_red("pattern of five squares")]</b> alongside <b>[span_red("Trappiste Fabriek")]</b> etched into it."
+
+#define COMPANY_SCARBOROUGH "It has <b>[span_orange("Scarborough Arms")]</b> stamped onto it."
+#define COMPANY_INTERDYNE "It has <b>[span_cyan("Interdyne Pharmaceuticals")]</b> stamped onto it."
+
+#define COMPANY_ALLSTAR "It has <b>[span_red("Allstar Lasers Inc.")]</b> stamped onto it."
+#define COMPANY_MICRON "It has <b>[span_cyan("Micron Control Sys.")]</b> cut into it."
+
+#define COMPANY_IZHEVSK "It has <b>[span_brown("Izhevsk Coalition")]</b> cut into it."
+#define COMPANY_TKACH "It has <b>[span_robot("Tkach Design Bureau")]</b> stamped onto it."
+
+#define COMPANY_ABDUCTOR "It has <b>[span_abductor("✌︎︎♌︎︎♎︎︎◆︎︎♍︎︎⧫︎︎❄︎♏︎♍︎♒︎")]</b> engraved into it."
+
+#define COMPANY_REMOVED "It has had <b>[span_grey("all identifying marks scrubbed off")].</b>"

code/__DEFINES/~monkestation/projectiles.dm

@@ -0,0 +1,22 @@
+/// The caliber used by the AK-25
+#define CALIBER_732x29 "a732x29"
+
+/// The caliber used by the Oldarms 'Mk.11.4 rifle', designed to be worse .223.
+#define CALIBER_223S ".223 Stinger"
+
+/// Caliber used by the giant anti materiel rifle in guncargo
+#define CALIBER_60STRELA ".60 Strela"
+
+/// Standard Sol rifle caliber
+#define CALIBER_SOL40LONG ".40 Sol Long"
+/// Standard Sol pistol caliber
+#define CALIBER_SOL35SHORT ".35 Sol Short"
+
+/// Basically 20mm grenades, I'd be concerned if a grenade launcher didn't use this
+#define CALIBER_980TYDHOUER ".980 Tydhouer"
+
+/// Large caliber pistol round for Sol hand cannons
+#define CALIBER_585TRAPPISTE ".585 Trappiste"
+
+/// Caliber used by the pepperball gun
+#define CALIBER_PEPPERBALL "pepperball"

code/__DEFINES/~monkestation/span.dm

@@ -4,6 +4,24 @@
 #define span_clockgray(str) ("<span class='clockgray'>" + str + "</span>")
 #define span_clockred(str) ("<span class='clockred'>" + str + "</span>")
 #define span_ratvar(str) ("<span class='ratvar'>" + str + "</span>")
-
+#define span_emote(str) ("<span class='emote'>" + str + "</span>")
+#define span_header(str) ("<span class='header'>" + str + "</span>")
+#define span_italics(str) ("<span class='italics'>" + str + "</span>")
+#define span_maptext(str) ("<span class='maptext'>" + str + "</span>")
+#define span_mentor(str) ("<span class='mentor'>" + str + "</span>")
+#define span_mentornotice(str) ("<span class='mentornotice'>" + str + "</span>")
+#define span_oocplain(str) ("<span class='oocplain'>" + str + "</span>")
+#define span_pink(str) ("<span class='pink'>" + str + "</span>")
+#define span_rlooc(str) ("<span class='rlooc'>" + str + "</span>")
+#define span_smalldanger(str) ("<span class='smalldanger'>" + str + "</span>")
+#define span_userlove(str) ("<span class='userlove'>" + str + "</span>")
+#define span_warningplain(str) ("<span class='warningplain'>" + str + "</span>")
+#define span_crossooc(str) ("<span class='crossooc'>" + str + "</span>")
+#define span_crossasay(str) ("<span class='crossasay'>" + str + "</span>")
+#define span_doyourjobidiot(str) ("<span class='doyourjobidiot'>" + str + "</span>")
+#define span_brown(str) ("<span class='brown'>" + str + "</span>")
+#define span_cyan(str) ("<span class='cyan'>" + str + "</span>")
+#define span_orange(str) ("<span class='orange'>" + str + "</span>")
+#define span_yellow(str) ("<span class='yellow'>" + str + "</span>")
 
 #define REQUEST_MENTORHELP "request_mentorhelp"

code/__DEFINES/~monkestation/traits.dm

@@ -10,3 +10,5 @@
 #define TRAIT_NO_SLAB_INVOKE "no_slab_invoke"
 /// Indicates that they've inhaled helium.
 #define TRAIT_HELIUM "helium"
+/// Allows the user to instantly reload.
+#define TRAIT_INSTANT_RELOAD "instant_reload"

code/controllers/subsystem/shuttle.dm

@@ -150,6 +150,10 @@ SUBSYSTEM_DEF(shuttle)
 	while(length(pack_processing))
 		var/datum/supply_pack/pack = pack_processing[length(pack_processing)]
 		pack_processing.len--
+		//MONKESTATION EDIT START
+		if(pack == /datum/supply_pack/armament)
+			continue
+		//MONKESTATION EDIT END
 		if(ispath(pack, /datum/supply_pack))
 			pack = new pack
 

code/datums/components/grillable.dm

@@ -13,7 +13,7 @@
 	/// REF() to the mind which placed us on the griddle
 	var/who_placed_us
 
-	/// What type of pollutant we spread around as we are grilleed, can be none  // SKYRAT EDIT ADDITION
+	/// What type of pollutant we spread around as we are grilleed, can be none  // MONKESTATION EDIT ADDITION
 	var/pollutant_type
 
 /datum/component/grillable/Initialize(cook_result, required_cook_time, positive_result, use_large_steam_sprite, pollutant_type)

code/datums/hud.dm

@@ -18,7 +18,7 @@ GLOBAL_LIST_INIT(huds, list(
 	DATA_HUD_SENTIENT_DISEASE = new/datum/atom_hud/sentient_disease(),
 	DATA_HUD_AI_DETECT = new/datum/atom_hud/ai_detector(),
 	DATA_HUD_FAN = new/datum/atom_hud/data/human/fan_hud(),
-	DATA_HUD_PERMIT = new/datum/atom_hud/data/human/permit()
+	DATA_HUD_PERMIT = new/datum/atom_hud/data/human/permit(), //monkestation edit
 ))
 
 /datum/atom_hud

code/game/data_huds.dm

@@ -47,7 +47,7 @@
 	hud_icons = list(ID_HUD)
 
 /datum/atom_hud/data/human/security/advanced
-	hud_icons = list(ID_HUD, IMPTRACK_HUD, IMPLOYAL_HUD, IMPCHEM_HUD, WANTED_HUD, NANITE_HUD, PERMIT_HUD)
+	hud_icons = list(ID_HUD, IMPTRACK_HUD, IMPLOYAL_HUD, IMPCHEM_HUD, WANTED_HUD, NANITE_HUD, PERMIT_HUD) //monkestation edit: adds NANITE_HUD and PERMIT_HUD
 
 /datum/atom_hud/data/human/fan_hud
 	hud_icons = list(FAN_HUD)
@@ -272,13 +272,14 @@ Security HUDs! Basic mode shows only the job.
 		sechud_icon_state = "hudno_id"
 	holder.icon_state = sechud_icon_state
 	sec_hud_set_security_status()
-
+//monkestation edit start
 	var/image/permit_holder = hud_list[PERMIT_HUD]
 	permit_holder.pixel_y = I.Height() - world.icon_size
 	var/permit_icon_state = wear_id?.get_gun_permit_iconstate()
 	if(!permit_icon_state)
 		permit_icon_state = "hudfan_no"
 	permit_holder.icon_state = permit_icon_state
+//monkestation edit end
 
 /mob/living/proc/sec_hud_set_implants()
 	var/image/holder

code/game/machinery/cell_charger.dm

@@ -52,6 +52,12 @@
 		if(charging)
 			to_chat(user, span_warning("There is already a cell in the charger!"))
 			return
+		//MONKESTATION EDIT ADDITION
+		var/obj/item/stock_parts/cell/inserting_cell = W
+		if(inserting_cell.chargerate <= 0)
+			to_chat(user, span_warning("[inserting_cell] cannot be recharged!"))
+			return
+		//MONKESTATION EDIT END
 		else
 			var/area/a = loc.loc // Gets our locations location, like a dream within a dream
 			if(!isarea(a))

code/game/machinery/recharger.dm

@@ -14,9 +14,11 @@
 
 	var/static/list/allowed_devices = typecacheof(list(
 		/obj/item/gun/energy,
+		/obj/item/gun/microfusion, //monkestation edit
 		/obj/item/melee/baton/security,
 		/obj/item/ammo_box/magazine/recharge,
 		/obj/item/modular_computer,
+		/obj/item/stock_parts/cell/microfusion, //monkestation edit
 	))
 
 /obj/machinery/recharger/RefreshParts()
@@ -85,6 +87,19 @@
 					to_chat(user, span_notice("Your gun has no external power connector."))
 					return 1
 
+			//MONKESTATION EDIT ADDITION
+			if (istype(G, /obj/item/gun/microfusion))
+				var/obj/item/gun/microfusion/microfusion_gun = G
+				if(microfusion_gun.cell?.chargerate <= 0)
+					to_chat(user, span_notice("[microfusion_gun] cannot be recharged!"))
+					return TRUE
+
+			if(istype(G, /obj/item/stock_parts/cell/microfusion))
+				var/obj/item/stock_parts/cell/microfusion/inserting_cell = G
+				if(inserting_cell.chargerate <= 0)
+					to_chat(user, span_notice("[inserting_cell] cannot be recharged!"))
+					return TRUE
+			//MONKESTATION EDIT END
 			if(!user.transferItemToLoc(G, src))
 				return 1
 			setCharging(G)

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

@@ -335,6 +335,7 @@
 		/obj/item/clothing/gloves,
 		/obj/item/flashlight/seclite,
 		/obj/item/food/donut,
+		/obj/item/food/spaghetti/security, //monkestation change: tactical belt spaghetti
 		/obj/item/grenade,
 		/obj/item/holosign_creator/security,
 		/obj/item/knife/combat,
@@ -343,7 +344,7 @@
 		/obj/item/reagent_containers/spray/pepper,
 		/obj/item/restraints/handcuffs,
 		/obj/item/restraints/legcuffs/bola,
-		/obj/item/food/spaghetti/security, //monkestation change: tactical belt spaghetti
+		/obj/item/stock_parts/cell/microfusion, //monkestation edit
 	))
 
 /obj/item/storage/belt/security/full/PopulateContents()

code/game/objects/structures/crates_lockers/closets/secure/cargo.dm

@@ -21,3 +21,6 @@
 
 	// Traitor steal objective
 	new /obj/item/card/id/departmental_budget/car(src)
+	new /obj/item/gun/ballistic/rifle/boltaction/brand_new/quartermaster(src) // MONKESTATION EDIT - The QM's 'special' head item. It spawns loaded, but you have to find more ammo if you run out and get ready to manually load rounds in!
+	new /obj/item/cargo_teleporter(src) // MONKESTATION EDIT - Adds a cargo teleporter to QM locker, so they can intice others to research it
+	new /obj/item/clothing/glasses/hud/gun_permit(src) //MONKESTATION EDIT - GUN CARGO

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -129,27 +129,34 @@
 	..()
 	new /obj/item/clothing/accessory/armband/cargo(src)
 	new /obj/item/encryptionkey/headset_cargo(src)
+//monkestation edit start
+	new /obj/item/clothing/glasses/hud/gun_permit(src)
+	new /obj/item/storage/box/gunset/pepperball(src)
+//monkestation edit end
 
 /obj/structure/closet/secure_closet/security/engine
 
 /obj/structure/closet/secure_closet/security/engine/PopulateContents()
 	..()
 	new /obj/item/clothing/accessory/armband/engine(src)
 	new /obj/item/encryptionkey/headset_eng(src)
+	new /obj/item/storage/box/gunset/pepperball(src) //monkestation edit
 
 /obj/structure/closet/secure_closet/security/science
 
 /obj/structure/closet/secure_closet/security/science/PopulateContents()
 	..()
 	new /obj/item/clothing/accessory/armband/science(src)
 	new /obj/item/encryptionkey/headset_sci(src)
+	new /obj/item/storage/box/gunset/pepperball(src) //monkestation edit
 
 /obj/structure/closet/secure_closet/security/med
 
 /obj/structure/closet/secure_closet/security/med/PopulateContents()
 	..()
 	new /obj/item/clothing/accessory/armband/medblue(src)
 	new /obj/item/encryptionkey/headset_med(src)
+	new /obj/item/storage/box/gunset/pepperball(src) //monkestation edit
 
 /obj/structure/closet/secure_closet/detective
 	name = "\improper detective's cabinet"