Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] laser carbines for everyone* - disabler/laser carbines now for sale by microstar #649

Merged
merged 1 commit into from
Nov 16, 2023
Merged

[MIRROR] laser carbines for everyone* - disabler/laser carbines now for sale by microstar #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions modular_skyrat/master_files/code/modules/cargo/packs/security.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 10 additions & 2 deletions modular_skyrat/modules/company_imports/code/armament_datums/microstar_energy.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
6 changes: 5 additions & 1 deletion modular_skyrat/modules/gunsgalore/code/guns/energy.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Loading