diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index 07a503ed71b..e597cde388d 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -205,7 +205,7 @@ GLOBAL_LIST_INIT(detective_vest_allowed, list( /obj/item/tank/internals/plasmaman, /obj/item/storage/belt/holster/detective, /obj/item/storage/belt/holster/nukie, - /obj/item/storage/belt/holster/thermal, + /obj/item/storage/belt/holster/energy, /obj/item/gun/microfusion, //SKYRAT EDIT ADDITION )) @@ -223,7 +223,7 @@ GLOBAL_LIST_INIT(security_vest_allowed, list( /obj/item/tank/internals/plasmaman, /obj/item/storage/belt/holster/detective, /obj/item/storage/belt/holster/nukie, - /obj/item/storage/belt/holster/thermal, + /obj/item/storage/belt/holster/energy, /obj/item/gun/microfusion, //SKYRAT EDIT ADDITION )) @@ -237,7 +237,7 @@ GLOBAL_LIST_INIT(security_wintercoat_allowed, list( /obj/item/restraints/handcuffs, /obj/item/storage/belt/holster/detective, /obj/item/storage/belt/holster/nukie, - /obj/item/storage/belt/holster/thermal, + /obj/item/storage/belt/holster/energy, /obj/item/gun/microfusion, //SKYRAT EDIT ADDITION )) diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm index e461af834cb..53a413b0833 100644 --- a/code/game/objects/items/storage/holsters.dm +++ b/code/game/objects/items/storage/holsters.dm @@ -31,11 +31,11 @@ /obj/item/gun/energy/laser/thermal )) -/obj/item/storage/belt/holster/thermal - name = "thermal shoulder holsters" - desc = "A rather plain pair of shoulder holsters with a bit of insulated padding inside. Meant to hold a twinned pair of thermal pistols, but can fit several kinds of energy handguns as well." +/obj/item/storage/belt/holster/energy + name = "energy shoulder holsters" + desc = "A rather plain pair of shoulder holsters with a bit of insulated padding inside. Designed to hold energy weaponry." -/obj/item/storage/belt/holster/thermal/Initialize(mapload) +/obj/item/storage/belt/holster/energy/Initialize(mapload) . = ..() atom_storage.max_slots = 2 atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL @@ -44,15 +44,28 @@ /obj/item/gun/energy/disabler, /obj/item/gun/energy/dueling, /obj/item/food/grown/banana, - /obj/item/gun/energy/laser/thermal + /obj/item/gun/energy/laser/thermal, + /obj/item/gun/energy/recharge/ebow, )) -/obj/item/storage/belt/holster/thermal/PopulateContents() +/obj/item/storage/belt/holster/energy/thermal + name = "thermal shoulder holsters" + desc = "A rather plain pair of shoulder holsters with a bit of insulated padding inside. Meant to hold a twinned pair of thermal pistols, but can fit several kinds of energy handguns as well." + +/obj/item/storage/belt/holster/energy/thermal/PopulateContents() generate_items_inside(list( /obj/item/gun/energy/laser/thermal/inferno = 1, /obj/item/gun/energy/laser/thermal/cryo = 1, ),src) +/obj/item/storage/belt/holster/energy/disabler + desc = "A rather plain pair of shoulder holsters with a bit of insulated padding inside. Designed to hold energy weaponry. A production stamp indicates that it was shipped with a disabler." + +/obj/item/storage/belt/holster/energy/disabler/PopulateContents() + generate_items_inside(list( + /obj/item/gun/energy/disabler = 1, + ),src) + /obj/item/storage/belt/holster/detective name = "detective's holster" desc = "A holster able to carry handguns and some ammo. WARNING: Badasses only." diff --git a/code/modules/cargo/goodies.dm b/code/modules/cargo/goodies.dm index 89ab03b5b4a..cbc2f4e73a8 100644 --- a/code/modules/cargo/goodies.dm +++ b/code/modules/cargo/goodies.dm @@ -8,28 +8,28 @@ name = ".38 DumDum Speedloader" desc = "Contains one speedloader of .38 DumDum ammunition, good for embedding in soft targets." cost = PAYCHECK_CREW * 2 - access_view = ACCESS_BRIG + access_view = ACCESS_WEAPONS contains = list(/obj/item/ammo_box/c38/dumdum) /datum/supply_pack/goody/match38 name = ".38 Match Grade Speedloader" desc = "Contains one speedloader of match grade .38 ammunition, perfect for showing off trickshots." cost = PAYCHECK_CREW * 2 - access_view = ACCESS_BRIG + access_view = ACCESS_WEAPONS contains = list(/obj/item/ammo_box/c38/match) /datum/supply_pack/goody/rubber name = ".38 Rubber Speedloader" desc = "Contains one speedloader of bouncy rubber .38 ammunition, for when you want to bounce your shots off anything and everything." cost = PAYCHECK_CREW * 1.5 - access_view = ACCESS_BRIG + access_view = ACCESS_WEAPONS contains = list(/obj/item/ammo_box/c38/match/bouncy) /datum/supply_pack/goody/mars_single name = "Colt Detective Special Single-Pack" desc = "The HoS took your gun and your badge? No problem! Just pay the absurd taxation fee and you too can be reunited with the lethal power of a .38!" cost = PAYCHECK_CREW * 40 //they really mean a premium here - access_view = ACCESS_DETECTIVE + access_view = ACCESS_WEAPONS contains = list(/obj/item/gun/ballistic/revolver/c38/detective) */ //SKYRAT EDIT END @@ -37,7 +37,7 @@ name = "Stingbang Single-Pack" desc = "Contains one \"stingbang\" grenade, perfect for playing meanhearted pranks." cost = PAYCHECK_COMMAND * 2.5 - access_view = ACCESS_BRIG + access_view = ACCESS_WEAPONS contains = list(/obj/item/grenade/stingbang) /* //SKYRAT EDIT START - GUN CARGO @@ -54,26 +54,40 @@ access_view = ACCESS_ARMORY contains = list(/obj/item/gun/ballistic/shotgun/automatic/combat, /obj/item/storage/belt/bandolier) +/datum/supply_pack/goody/disabler_single + name = "Disabler Single-Pack" + desc = "Contains one disabler, the nonlethal workhorse of Nanotrasen security everywehere. Comes in a energy holster, just in case you happen to have an extra disabler." + cost = PAYCHECK_COMMAND * 3 + access_view = ACCESS_WEAPONS + contains = list(/obj/item/storage/belt/holster/energy/disabler) + /datum/supply_pack/goody/energy_single name = "Energy Gun Single-Pack" desc = "Contains one energy gun, capable of firing both nonlethal and lethal blasts of light." cost = PAYCHECK_COMMAND * 12 - access_view = ACCESS_ARMORY + access_view = ACCESS_WEAPONS contains = list(/obj/item/gun/energy/e_gun) +/datum/supply_pack/goody/laser_single + name = "Laser Gun Single-Pack" + desc = "Contains one laser gun, the lethal workhorse of Nanotrasen security everywehere." + cost = PAYCHECK_COMMAND * 6 + access_view = ACCESS_WEAPONS + contains = list(/obj/item/gun/energy/laser) + /datum/supply_pack/goody/hell_single name = "Hellgun Kit Single-Pack" desc = "Contains one hellgun degradation kit, an old pattern of laser gun infamous for its ability to horribly disfigure targets with burns. Technically violates the Space Geneva Convention when used on humanoids." cost = PAYCHECK_CREW * 2 - access_view = ACCESS_ARMORY + access_view = ACCESS_WEAPONS contains = list(/obj/item/weaponcrafting/gunkit/hellgun) /datum/supply_pack/goody/thermal_single name = "Thermal Pistol Holster Single-Pack" desc = "Contains twinned thermal pistols in a holster, ready for use in the field." cost = PAYCHECK_COMMAND * 15 - access_view = ACCESS_ARMORY - contains = list(/obj/item/storage/belt/holster/thermal) + access_view = ACCESS_WEAPONS + contains = list(/obj/item/storage/belt/holster/energy/thermal) */ //SKYRAT EDIT END /datum/supply_pack/goody/sologamermitts diff --git a/code/modules/cargo/packs/security.dm b/code/modules/cargo/packs/security.dm index 5f5a2961b65..b1e968e54e1 100644 --- a/code/modules/cargo/packs/security.dm +++ b/code/modules/cargo/packs/security.dm @@ -377,7 +377,7 @@ desc = "Contains a pair of holsters each with two experimental thermal pistols, \ using nanites as the basis for their ammo. Requires Armory access to open." cost = CARGO_CRATE_VALUE * 7 - contains = list(/obj/item/storage/belt/holster/thermal = 2) + contains = list(/obj/item/storage/belt/holster/energy/thermal = 2) crate_name = "thermal pistol crate" /datum/supply_pack/security/armory/wt550 diff --git a/modular_skyrat/modules/company_imports/code/armament_datums/bolt_nanotrasen_firearms.dm b/modular_skyrat/modules/company_imports/code/armament_datums/bolt_nanotrasen_firearms.dm index 8c742575610..a7bcf5d3c41 100644 --- a/modular_skyrat/modules/company_imports/code/armament_datums/bolt_nanotrasen_firearms.dm +++ b/modular_skyrat/modules/company_imports/code/armament_datums/bolt_nanotrasen_firearms.dm @@ -56,8 +56,8 @@ lower_cost = CARGO_CRATE_VALUE * 5 upper_cost = CARGO_CRATE_VALUE * 7 -/datum/armament_entry/company_import/nanotrasen_bolt_weapons/lethal_sidearm/thermal_holsters - item_type = /obj/item/storage/belt/holster/thermal +/datum/armament_entry/company_import/nanotrasen_bolt_weapons/lethal_sidearm/energy_holster + item_type = /obj/item/storage/belt/holster/energy lower_cost = CARGO_CRATE_VALUE * 5 upper_cost = CARGO_CRATE_VALUE * 9