diff --git a/modular_skyrat/master_files/code/modules/cargo/packs/security.dm b/modular_skyrat/master_files/code/modules/cargo/packs/security.dm index 9746267dbdd..a78f2369c1c 100644 --- a/modular_skyrat/master_files/code/modules/cargo/packs/security.dm +++ b/modular_skyrat/master_files/code/modules/cargo/packs/security.dm @@ -10,17 +10,11 @@ /datum/supply_pack/security/helmets special = TRUE -/datum/supply_pack/security/laser - special = TRUE - /datum/supply_pack/security/securityclothes special = TRUE /datum/supply_pack/security/armory/ballistic special = TRUE -/datum/supply_pack/security/armory/energy - special = TRUE - /datum/supply_pack/security/armory/thermal special = TRUE diff --git a/modular_skyrat/modules/company_imports/code/armament_datums/microstar_energy.dm b/modular_skyrat/modules/company_imports/code/armament_datums/microstar_energy.dm index 060a149e5df..9c4c1484007 100644 --- a/modular_skyrat/modules/company_imports/code/armament_datums/microstar_energy.dm +++ b/modular_skyrat/modules/company_imports/code/armament_datums/microstar_energy.dm @@ -11,6 +11,10 @@ item_type = /obj/item/gun/energy/disabler cost = PAYCHECK_CREW * 5 +/datum/armament_entry/company_import/microstar/basic_energy_weapons/disabler_smg + item_type = /obj/item/gun/energy/disabler/smg + cost = PAYCHECK_CREW * 7 // slightly more expensive due to ease of use/full auto + /datum/armament_entry/company_import/microstar/basic_energy_weapons/mini_egun item_type = /obj/item/gun/energy/e_gun/mini cost = PAYCHECK_CREW * 5 @@ -22,11 +26,15 @@ /datum/armament_entry/company_import/microstar/basic_energy_long_weapons subcategory = "Basic Energy Longarms" -/datum/armament_entry/company_import/microstar/basic_energy_long_weapons/sc1 +/datum/armament_entry/company_import/microstar/basic_energy_long_weapons/laser item_type = /obj/item/gun/energy/laser cost = PAYCHECK_CREW * 5 -/datum/armament_entry/company_import/microstar/basic_energy_long_weapons/sc2 +/datum/armament_entry/company_import/microstar/basic_energy_long_weapons/laser_carbine + item_type = /obj/item/gun/energy/laser/carbine + cost = PAYCHECK_CREW * 7 // slightly more expensive due to ease of use/full auto + +/datum/armament_entry/company_import/microstar/basic_energy_long_weapons/egun item_type = /obj/item/gun/energy/e_gun cost = PAYCHECK_COMMAND * 4 diff --git a/modular_skyrat/modules/gunsgalore/code/guns/energy.dm b/modular_skyrat/modules/gunsgalore/code/guns/energy.dm index 39e70ae6f96..8e847ca4fb9 100644 --- a/modular_skyrat/modules/gunsgalore/code/guns/energy.dm +++ b/modular_skyrat/modules/gunsgalore/code/guns/energy.dm @@ -1,6 +1,10 @@ /obj/item/gun/energy/laser name = "\improper Allstar SC-1 laser carbine" - desc = "An energy-based laser carbine that fires concentrated beams of light which pass through glass and thin metal." + desc = "A basic energy-based laser carbine that fires concentrated beams of light which pass through glass and thin metal." + +/obj/item/gun/energy/laser/carbine + name = "\improper Allstar SC-1A laser auto-carbine" + desc = "An basic energy-based laser auto-carbine that rapidly fires weakened, concentrated beams of light which pass through glass and thin metal." /obj/item/gun/energy/e_gun name = "\improper Allstar SC-2 energy carbine"