From e2856a307f5b8d335920d62c365e89bd15e1c40a Mon Sep 17 00:00:00 2001 From: Noname995 Date: Wed, 22 May 2024 21:19:03 +0300 Subject: [PATCH] =?UTF-8?q?=D0=AD=D1=82=D0=BE=20=D0=BF=D1=80=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D0=BE=20=D0=B6=D0=B5=D1=81=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vending/vendor_types/squad_prep/squad_specialist.dm | 1 + code/modules/cm_tech/techs/marine/tier1/points.dm | 2 +- code/modules/cm_tech/techs/marine/tier2/orbital_ammo.dm | 2 +- code/modules/cm_tech/techs/marine/tier3/cryorine.dm | 2 +- colonialmarines.dme | 2 ++ .../cm_tech/techs/marine/tier1/engi_upgrade_mod.dm | 2 +- .../cm_tech/techs/marine/tier1/medic_upgrade_qol.dm | 2 +- .../code/modules/projectiles/magazines/flamer.dm | 7 +++++++ .../code/modules/reagents/chemistry_reagents/other.dm | 9 +++++++++ 9 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 fray-marines/code/modules/projectiles/magazines/flamer.dm create mode 100644 fray-marines/code/modules/reagents/chemistry_reagents/other.dm diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm index 3296e36cd8e0..dcbcf5b79bf7 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm @@ -36,6 +36,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_spec, list( list("Large Incinerator Tank", 40, /obj/item/ammo_magazine/flamer_tank/large, null, VENDOR_ITEM_REGULAR), list("Large Incinerator Tank (B) (Green Flame)", 40, /obj/item/ammo_magazine/flamer_tank/large/B, null, VENDOR_ITEM_REGULAR), list("Large Incinerator Tank (X) (Blue Flame)", 40, /obj/item/ammo_magazine/flamer_tank/large/X, null, VENDOR_ITEM_REGULAR), + list("Large Incinerator Tank (EP) (Purple Flame !DANGER!)", 80, /obj/item/ammo_magazine/flamer_tank/large/napalmep, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), diff --git a/code/modules/cm_tech/techs/marine/tier1/points.dm b/code/modules/cm_tech/techs/marine/tier1/points.dm index dcaf8ca4ed2b..5a2fd2ecff85 100644 --- a/code/modules/cm_tech/techs/marine/tier1/points.dm +++ b/code/modules/cm_tech/techs/marine/tier1/points.dm @@ -40,7 +40,7 @@ flags = TREE_FLAG_MARINE tier = /datum/tier/one - var/points_to_give = 2500 + var/points_to_give = 5000 /datum/tech/repeatable/dropship_points/on_unlock() . = ..() diff --git a/code/modules/cm_tech/techs/marine/tier2/orbital_ammo.dm b/code/modules/cm_tech/techs/marine/tier2/orbital_ammo.dm index 303ea6121734..74b622900478 100644 --- a/code/modules/cm_tech/techs/marine/tier2/orbital_ammo.dm +++ b/code/modules/cm_tech/techs/marine/tier2/orbital_ammo.dm @@ -2,7 +2,7 @@ name = "OB Ammo" desc = "Purchase orbital bombardment ammo." - required_points = 10 + required_points = 3 increase_per_purchase = 2 tier = /datum/tier/two diff --git a/code/modules/cm_tech/techs/marine/tier3/cryorine.dm b/code/modules/cm_tech/techs/marine/tier3/cryorine.dm index 404fbd07c2ae..e0a369478d9a 100644 --- a/code/modules/cm_tech/techs/marine/tier3/cryorine.dm +++ b/code/modules/cm_tech/techs/marine/tier3/cryorine.dm @@ -8,7 +8,7 @@ announce_message = "Additional troops are being taken out of cryo." required_points = 6 - increase_per_purchase = 6 + increase_per_purchase = 2 flags = TREE_FLAG_MARINE tier = /datum/tier/three diff --git a/colonialmarines.dme b/colonialmarines.dme index e11a791a858d..984d535a8538 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -2532,7 +2532,9 @@ #include "fray-marines\code\modules\mob\living\simple_animal\hostile\alien\tearer.dm" #include "fray-marines\code\modules\mob\living\simple_animal\hostile\alien\trooper.dm" #include "fray-marines\code\modules\projectiles\ammo_datums.dm" +#include "fray-marines\code\modules\projectiles\magazines\flamer.dm" #include "fray-marines\code\modules\projectiles\magazines\magazines_assorted.dm" +#include "fray-marines\code\modules\reagents\chemistry_reagents\other.dm" #include "fray-marines\code\modules\shuttle\gamemodes\crash.dm" #include "fray-marines\code\modules\vehicles\hardpoints_walker.dm" #include "fray-marines\code\modules\vehicles\walker.dm" diff --git a/fray-marines/code/modules/cm_tech/techs/marine/tier1/engi_upgrade_mod.dm b/fray-marines/code/modules/cm_tech/techs/marine/tier1/engi_upgrade_mod.dm index b965b04095a7..463e63f00c72 100644 --- a/fray-marines/code/modules/cm_tech/techs/marine/tier1/engi_upgrade_mod.dm +++ b/fray-marines/code/modules/cm_tech/techs/marine/tier1/engi_upgrade_mod.dm @@ -25,7 +25,7 @@ . = ..() if(!H || !D) return - if(H.job == JOB_SQUAD_ENGI) + if(H.job == JOB_SQUAD_ENGI || JOB_SYNTH) .["21S Tesla Coil"] = /obj/item/storage/box/combat_zone_engi_package_tesla .["UA 42-F Sentry Flamer"] = /obj/item/storage/box/combat_zone_engi_package_flamer .["UA 571-C Sentry Gun"] = /obj/item/storage/box/combat_zone_engi_package diff --git a/fray-marines/code/modules/cm_tech/techs/marine/tier1/medic_upgrade_qol.dm b/fray-marines/code/modules/cm_tech/techs/marine/tier1/medic_upgrade_qol.dm index 9c45ed8d5fa1..8cc597eaa83b 100644 --- a/fray-marines/code/modules/cm_tech/techs/marine/tier1/medic_upgrade_qol.dm +++ b/fray-marines/code/modules/cm_tech/techs/marine/tier1/medic_upgrade_qol.dm @@ -13,7 +13,7 @@ . = ..() if(!H || !D) return - if(H.job == JOB_SQUAD_MEDIC) + if(H.job == JOB_SQUAD_MEDIC || JOB_MEDIC_ROLES_LIST || JOB_COMMAND_ROLES_LIST || JOB_SYNTH) .["Medical CZSP"] = /obj/item/storage/box/combat_zone_support_package else var/type_to_add = /obj/item/stack/medical/bruise_pack diff --git a/fray-marines/code/modules/projectiles/magazines/flamer.dm b/fray-marines/code/modules/projectiles/magazines/flamer.dm new file mode 100644 index 000000000000..2b51a432d3e6 --- /dev/null +++ b/fray-marines/code/modules/projectiles/magazines/flamer.dm @@ -0,0 +1,7 @@ +/obj/item/ammo_magazine/flamer_tank/large/napalmep + name = "large incinerator tank (EP)" + desc = "A large fuel tank of sticky combustible liquid chemical that penetrates the best fire retardants." + caliber = "Napalm EP" + flamer_chem = "napalmep" + + max_range = 6 diff --git a/fray-marines/code/modules/reagents/chemistry_reagents/other.dm b/fray-marines/code/modules/reagents/chemistry_reagents/other.dm new file mode 100644 index 000000000000..69cb3d3754f1 --- /dev/null +++ b/fray-marines/code/modules/reagents/chemistry_reagents/other.dm @@ -0,0 +1,9 @@ +/datum/reagent/napalm/penetrating/pyro + name = "Napalm EP" + id = "napalmep" + properties = list( + PROPERTY_INTENSITY = BURN_LEVEL_TIER_1, // Minimal damage + PROPERTY_DURATION = BURN_TIME_TIER_4, // Green minus one + PROPERTY_RADIUS = 6, + PROPERTY_FIRE_PENETRATING = 1, // OMG, QUEEN IN FIRE!!!! + )