diff --git a/code/modules/research/techweb/nodes/security_nodes.dm b/code/modules/research/techweb/nodes/security_nodes.dm index dcd767782aa8aa..50cb0126059e09 100644 --- a/code/modules/research/techweb/nodes/security_nodes.dm +++ b/code/modules/research/techweb/nodes/security_nodes.dm @@ -57,7 +57,6 @@ "ballistic_shield", "handcuffs_s", "bola_energy", - "platillo", // DOPPLER EDIT ADDITION - makes shield gauntlets recipe accessible ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS) announce_channels = list(RADIO_CHANNEL_SECURITY) diff --git a/modular_doppler/modular_vending/code/tg_vendors/sectech.dm b/modular_doppler/modular_vending/code/tg_vendors/sectech.dm index 183b21a32afb62..fa3c8465a94de1 100644 --- a/modular_doppler/modular_vending/code/tg_vendors/sectech.dm +++ b/modular_doppler/modular_vending/code/tg_vendors/sectech.dm @@ -16,13 +16,6 @@ /obj/item/food/donut/jelly/berry = 1, /obj/item/food/donut/jelly/apple = 1, /obj/item/food/donut/jelly/choco = 1, - ) - premium_doppler = list( - /obj/item/gun/ballistic/automatic/schiebenmaschine = 30, - /obj/item/gun/ballistic/avispa_stingball_shooter = 5, - /obj/item/knife/combat/survival = 3, - /obj/item/reagent_containers/cup/soda_cans/monkey_energy = 5, - /obj/item/reagent_containers/cup/soda_cans/grey_bull = 5, /obj/item/ammo_casing/alacran_dart/adrenaline = 4, /obj/item/ammo_casing/alacran_dart/krotozine = 4, /obj/item/ammo_casing/alacran_dart/adrenaline/piercing = 4, @@ -32,3 +25,10 @@ /obj/item/storage/box/alacran_dart = 3, /obj/item/storage/box/alacran_dart/piercing = 3, ) + premium_doppler = list( + /obj/item/gun/ballistic/automatic/schiebenmaschine = 30, + /obj/item/gun/ballistic/avispa_stingball_shooter = 5, + /obj/item/knife/combat/survival = 3, + /obj/item/reagent_containers/cup/soda_cans/monkey_energy = 5, + /obj/item/reagent_containers/cup/soda_cans/grey_bull = 5, + ) diff --git a/modular_doppler/modular_weapons/code/ammo/alacran_dart_packs.dm b/modular_doppler/modular_weapons/code/ammo/alacran_dart_packs.dm index 3cb5d929736209..032ced9cca2024 100644 --- a/modular_doppler/modular_weapons/code/ammo/alacran_dart_packs.dm +++ b/modular_doppler/modular_weapons/code/ammo/alacran_dart_packs.dm @@ -3,7 +3,7 @@ name = "box of Alacran darts" desc = "A box with a mixed array of standard, non-piercing dart rounds for the Alacran platform." icon_state = "secbox" - custom_price = PAYCHECK_COMMAND * 5.5 + custom_price = PAYCHECK_CREW * 5.5 /obj/item/storage/box/alacran_dart/PopulateContents() . = ..() @@ -18,7 +18,7 @@ /obj/item/storage/box/alacran_dart/piercing name = "box of piercing Alacran darts" desc = "A box with a mixed array of armor piercing dart rounds for the Alacran platform." - custom_price = PAYCHECK_COMMAND * 5.5 + custom_price = PAYCHECK_CREW * 5.5 /obj/item/storage/box/alacran_dart/piercing/PopulateContents() . = ..() diff --git a/modular_doppler/modular_weapons/code/ammo/alacran_darts.dm b/modular_doppler/modular_weapons/code/ammo/alacran_darts.dm index 3695d13f04f6c3..4cfb9e4a491cdc 100644 --- a/modular_doppler/modular_weapons/code/ammo/alacran_darts.dm +++ b/modular_doppler/modular_weapons/code/ammo/alacran_darts.dm @@ -15,7 +15,7 @@ caliber = CALIBER_ALACRAN projectile_type = /obj/projectile/bullet/dart/alacran_dart harmful = FALSE - custom_price = PAYCHECK_COMMAND + custom_price = PAYCHECK_CREW /// A list of the reagents in our payload var/list/dart_reagents @@ -52,13 +52,13 @@ /obj/item/ammo_casing/alacran_dart/adrenaline/piercing name = "\improper Puya adrenaline dart - armor piercing" projectile_type = /obj/projectile/bullet/dart/alacran_piercing_dart - custom_price = PAYCHECK_COMMAND * 1.2 + custom_price = PAYCHECK_CREW * 1.2 /obj/item/ammo_casing/alacran_dart/krotozine name = "\improper Puya krotozine manipulative dart" desc = "A proprietary dart for the Alacran platform. This one contains a mixture of stimulants and weak healing agents." greyscale_colors = "#905ea9#905ea9" - custom_price = PAYCHECK_COMMAND * 2 + custom_price = PAYCHECK_CREW * 2 dart_reagents = list( /datum/reagent/medicine/ondansetron = 3, /datum/reagent/drug/kronkaine = 5, @@ -69,12 +69,12 @@ /obj/item/ammo_casing/alacran_dart/krotozine/piercing name = "\improper Puya krotozine manipulative dart - armor piercing" projectile_type = /obj/projectile/bullet/dart/alacran_piercing_dart - custom_price = PAYCHECK_COMMAND * 2.4 + custom_price = PAYCHECK_CREW * 2.4 /obj/item/ammo_casing/alacran_dart/rootbeer // no piercing version on purpose name = "\improper Puya 'sharpshooter' dart" desc = "A proprietary dart for the Alacran platform. This one contains a mixture of stimulants and nootropics purported to assist in firearms use." - custom_price = PAYCHECK_COMMAND * 1.1 + custom_price = PAYCHECK_CREW * 1.1 greyscale_colors = "#663300#663300" dart_reagents = list( /datum/reagent/consumable/rootbeer = 13, @@ -85,7 +85,7 @@ name = "\improper Puya 'electric wizard' experimental tranquilizer dart" desc = "A proprietary dart for the Alacran platform. This one contains an experimental sedative for use in apprehending suspected criminals. All rights reserved. \ Not recommended for use on assailants with pre-existing heart conditions." - custom_price = PAYCHECK_COMMAND * 1.1 + custom_price = PAYCHECK_CREW * 1.1 greyscale_colors = "#800000#808080" dart_reagents = list( /datum/reagent/consumable/ethanol/beepsky_smash = 10, @@ -99,7 +99,7 @@ desc = "A third party imitation of Deforest-branded darts for the Alacran platform. This one contains a mix of experimental healing chemicals and exotic nootropics \ and bears a disconcertingly nonspecific warning regarding side effects. Caveat injector." greyscale_colors = "#8987ff#4d9be6" - custom_price = PAYCHECK_COMMAND * 0.9 + custom_price = PAYCHECK_CREW * 0.9 dart_reagents = list( /datum/reagent/medicine/earthsblood = 6, /datum/reagent/toxin/lipolicide = 3, @@ -143,7 +143,7 @@ /obj/item/ammo_casing/alacran_dart/morpital/piercing name = "\improper Puya morpital regeneration dart - armor piercing" projectile_type = /obj/projectile/bullet/dart/alacran_piercing_dart - custom_price = PAYCHECK_COMMAND * 1.2 + custom_price = PAYCHECK_CREW * 1.2 /obj/item/ammo_casing/alacran_dart/meridine name = "\improper Puya meridine antidote dart" @@ -175,7 +175,7 @@ /obj/item/ammo_casing/alacran_dart/slurry/piercing name = "\improper Puya smart-slurry dart - armor piercing" projectile_type = /obj/projectile/bullet/dart/alacran_piercing_dart - custom_price = PAYCHECK_COMMAND * 1.2 + custom_price = PAYCHECK_CREW * 1.2 /obj/item/ammo_casing/alacran_dart/sensory_restoration name = "\improper Puya occuisate sensory restoration dart" @@ -192,7 +192,7 @@ /obj/item/ammo_casing/alacran_dart/sensory_restoration/piercing name = "\improper Puya occuisate sensory restoration dart - armor piercing" projectile_type = /obj/projectile/bullet/dart/alacran_piercing_dart - custom_price = PAYCHECK_COMMAND * 1.2 + custom_price = PAYCHECK_CREW * 1.2 /obj/item/ammo_casing/alacran_dart/quadruple_sec name = "\improper Puya experimental salve dart" diff --git a/modular_doppler/modular_weapons/code/ammo_stacks/naraka_585.dm b/modular_doppler/modular_weapons/code/ammo_stacks/naraka_585.dm index 52d94ba66d7eb4..4413f0450ac329 100644 --- a/modular_doppler/modular_weapons/code/ammo_stacks/naraka_585.dm +++ b/modular_doppler/modular_weapons/code/ammo_stacks/naraka_585.dm @@ -35,10 +35,3 @@ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO, ) departmental_flags = DEPARTMENT_BITFLAG_SECURITY - -/datum/techweb_node/basic_arms/New() - design_ids |= list( - "c585naraka", - "c25euro", - ) - return ..() diff --git a/modular_doppler/modular_weapons/code/ammo_stacks/stingballs.dm b/modular_doppler/modular_weapons/code/ammo_stacks/stingballs.dm index 78e5fd56b174b8..632c61932ac963 100644 --- a/modular_doppler/modular_weapons/code/ammo_stacks/stingballs.dm +++ b/modular_doppler/modular_weapons/code/ammo_stacks/stingballs.dm @@ -15,7 +15,19 @@ materials = list(/datum/material/plastic = SMALL_MATERIAL_AMOUNT * 3) build_path = /obj/item/ammo_casing/avispa_stingball category = list( - RND_CATEGORY_HACKED, + RND_CATEGORY_INITIAL, + RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO, + ) + departmental_flags = DEPARTMENT_BITFLAG_SECURITY + +/datum/design/avispa_stingball + name = ".61 stingballs (Less Lethal)" + id = "61stingball" + build_type = PROTOLATHE | AWAY_LATHE + materials = list(/datum/material/plastic = SMALL_MATERIAL_AMOUNT * 3) + build_path = /obj/item/ammo_casing/avispa_stingball + category = list( + RND_CATEGORY_INITIAL, RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO, ) departmental_flags = DEPARTMENT_BITFLAG_SECURITY diff --git a/modular_doppler/modular_weapons/code/techweb_override.dm b/modular_doppler/modular_weapons/code/techweb_override.dm new file mode 100644 index 00000000000000..de1bf52a52b67e --- /dev/null +++ b/modular_doppler/modular_weapons/code/techweb_override.dm @@ -0,0 +1,15 @@ +// for injecting modular weapons, ammo, etc into the techweb without nonmodular edits. + +/datum/techweb_node/basic_arms/New() + design_ids |= list( + "c585naraka", + "c25euro", + "61stingball", + ) + return ..() + +/datum/techweb_node/riot_supression/New() + design_ids |= list( + "platillo", + ) + return ..() diff --git a/tgstation.dme b/tgstation.dme index c79ace1716333c..8e90c11d40c414 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7616,6 +7616,7 @@ #include "modular_doppler\modular_weapons\code\melee.dm" #include "modular_doppler\modular_weapons\code\security_equipment_packages.dm" #include "modular_doppler\modular_weapons\code\shields.dm" +#include "modular_doppler\modular_weapons\code\techweb_override.dm" #include "modular_doppler\modular_weapons\code\weapon_overrides.dm" #include "modular_doppler\modular_weapons\code\ammo\alacran_dart_packs.dm" #include "modular_doppler\modular_weapons\code\ammo\alacran_darts.dm"