Skip to content

Commit

Permalink
Это просто жесть
Browse files Browse the repository at this point in the history
  • Loading branch information
Noname995 committed May 22, 2024
1 parent 30b6bcf commit e2856a3
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cm_tech/techs/marine/tier1/points.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
. = ..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cm_tech/techs/marine/tier2/orbital_ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cm_tech/techs/marine/tier3/cryorine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions colonialmarines.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions fray-marines/code/modules/projectiles/magazines/flamer.dm
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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!!!!
)

0 comments on commit e2856a3

Please sign in to comment.