diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm index b26e6e685c6..f34935f3afc 100644 --- a/code/game/objects/machinery/vending/marine_vending.dm +++ b/code/game/objects/machinery/vending/marine_vending.dm @@ -116,7 +116,7 @@ /obj/item/ammo_magazine/rifle/pepperball = -1, /obj/item/weapon/gun/flamer/big_flamer/marinestandard = 4, /obj/item/ammo_magazine/flamer_tank/large = 16, - /obj/item/ammo_magazine/flamer_tank/large/G = 16, + /obj/item/ammo_magazine/flamer_tank/large/G = 8, /obj/item/ammo_magazine/flamer_tank/backtank = 4, /obj/item/ammo_magazine/flamer_tank/water = -1, /obj/item/jetpack_marine = 3, @@ -157,6 +157,7 @@ /obj/item/weapon/gun/energy/lasgun/lasrifle/pocket_beam = -1, /obj/item/weapon/gun/flamer/mini_flamer = -1, /obj/item/ammo_magazine/flamer_tank/mini = -1, + /obj/item/ammo_magazine/flamer_tank/mini/G = 15, /obj/item/weapon/gun/rifle/pepperball/pepperball_mini = -1, /obj/item/ammo_magazine/rifle/pepperball/pepperball_mini = -1, /obj/item/attachable/stock/t76 = -1, @@ -333,7 +334,7 @@ /obj/item/ammo_magazine/rifle/pepperball = 40, /obj/item/weapon/gun/flamer/big_flamer/marinestandard = 4, /obj/item/ammo_magazine/flamer_tank/large = 30, - /obj/item/ammo_magazine/flamer_tank/large/G = 30, + /obj/item/ammo_magazine/flamer_tank/large/G = 15, /obj/item/ammo_magazine/flamer_tank/backtank = 4, /obj/item/ammo_magazine/flamer_tank/water = -1, /obj/item/jetpack_marine = 3, @@ -379,6 +380,7 @@ /obj/item/weapon/gun/energy/lasgun/lasrifle/pocket_beam = -1, /obj/item/weapon/gun/flamer/mini_flamer = -1, /obj/item/ammo_magazine/flamer_tank/mini = -1, + /obj/item/ammo_magazine/flamer_tank/mini/G = 15, /obj/item/weapon/gun/rifle/pepperball/pepperball_mini = -1, /obj/item/ammo_magazine/rifle/pepperball/pepperball_mini = -1, /obj/item/attachable/stock/t76 = -1, @@ -618,6 +620,7 @@ /obj/item/weapon/gun/energy/lasgun/lasrifle/pocket_beam = -1, /obj/item/weapon/gun/flamer/mini_flamer = -1, /obj/item/ammo_magazine/flamer_tank/mini = -1, + /obj/item/ammo_magazine/flamer_tank/mini/G = -1, /obj/item/weapon/gun/rifle/pepperball/pepperball_mini = -1, /obj/item/ammo_magazine/rifle/pepperball/pepperball_mini = -1, /obj/item/attachable/stock/t76 = -1, diff --git a/code/modules/projectiles/ammo_datums/energy.dm b/code/modules/projectiles/ammo_datums/energy.dm index f13e9c389b9..cb2fbeac922 100644 --- a/code/modules/projectiles/ammo_datums/energy.dm +++ b/code/modules/projectiles/ammo_datums/energy.dm @@ -638,7 +638,7 @@ ///Fire damage var/burn_damage = 9 ///Fire color - var/fire_color = "green" + var/fire_color = FLAME_COLOR_GREEN /datum/ammo/energy/plasma_pistol/proc/drop_fire(atom/target, obj/projectile/proj) var/turf/target_turf = get_turf(target) diff --git a/code/modules/projectiles/guns/flamer.dm b/code/modules/projectiles/guns/flamer.dm index 078dbc1f4fb..f1c8169d883 100644 --- a/code/modules/projectiles/guns/flamer.dm +++ b/code/modules/projectiles/guns/flamer.dm @@ -361,6 +361,10 @@ allowed_ammo_types = list( /obj/item/ammo_magazine/flamer_tank/mini, /obj/item/ammo_magazine/flamer_tank/backtank, + /obj/item/ammo_magazine/flamer_tank/mini/X, + /obj/item/ammo_magazine/flamer_tank/backtank/X, + /obj/item/ammo_magazine/flamer_tank/mini/G, + /obj/item/ammo_magazine/flamer_tank/backtank/G, ) starting_attachment_types = list(/obj/item/attachable/flamer_nozzle/unremovable/invisible) attachable_allowed = list( diff --git a/code/modules/projectiles/magazines/flamer.dm b/code/modules/projectiles/magazines/flamer.dm index fdce7964d77..83d2334e811 100644 --- a/code/modules/projectiles/magazines/flamer.dm +++ b/code/modules/projectiles/magazines/flamer.dm @@ -80,6 +80,18 @@ icon_state_mini = "tank_blue" dispenser_type = /obj/structure/reagent_dispensers/fueltank/xfuel +/obj/item/ammo_magazine/flamer_tank/mini/X + name = "mini incinerator tank (X)" + desc = "A large fuel tank of ultra thick napthal Fuel type X, a sticky combustable liquid chemical that burns extremely hot, for use in the underail incinerator unit. Handle with care." + icon_state = "flametank_mini_blue" + default_ammo = /datum/ammo/flamethrower/blue + reload_delay = 0 SECONDS + w_class = WEIGHT_CLASS_SMALL + current_rounds = 25 + max_rounds = 25 + icon_state_mini = "tank_blue_mini" + dispenser_type = /obj/structure/reagent_dispensers/fueltank/xfuel + /obj/item/ammo_magazine/flamer_tank/large/G name = "large flamethrower tank (G)" desc = "A large fuel tank of ultra thick plasma Fuel type G, a sticky combustable liquid chemical, for use in the FL-84 flamethrower. Handle with care." @@ -88,6 +100,18 @@ icon_state_mini = "tank_green" dispenser_type = /obj/structure/reagent_dispensers/fueltank/gfuel +/obj/item/ammo_magazine/flamer_tank/mini/G + name = "mini incinerator tank (G)" + desc = "A large fuel tank of ultra thick plasma Fuel type G, a sticky combustable liquid chemical that burns extremely hot, for use in the underail incinerator unit. Handle with care." + icon_state = "flametank_mini_green" + default_ammo = /datum/ammo/flamethrower/green + reload_delay = 0 SECONDS + w_class = WEIGHT_CLASS_SMALL + current_rounds = 25 + max_rounds = 25 + icon_state_mini = "tank_green_mini" + dispenser_type = /obj/structure/reagent_dispensers/fueltank/gfuel + /obj/item/ammo_magazine/flamer_tank/large/X/deathsquad name = "Gargantuan flamethrower X-tank" desc = "Using Bluespace technology, Nanotrasen has managed to fit in way more x-fuel than you would ever hope to need in a single lifetime into this specialized tank." @@ -117,6 +141,13 @@ default_ammo = /datum/ammo/flamethrower/blue dispenser_type = /obj/structure/reagent_dispensers/fueltank/xfuel +/obj/item/ammo_magazine/flamer_tank/backtank/G + name = "back fuel tank (G)" + desc = "A specialized fuel tank of plasma type G for use with the FL-84 flamethrower and FL-240 incinerator unit." + icon_state = "g_flamethrower_tank" + default_ammo = /datum/ammo/flamethrower/green + dispenser_type = /obj/structure/reagent_dispensers/fueltank/gfuel + /obj/item/ammo_magazine/flamer_tank/water name = "pressurized water tank" desc = "A cannister of water for use with the FL-84's underslung extinguisher. Can be refilled by hand." diff --git a/code/modules/reqs/supplypacks.dm b/code/modules/reqs/supplypacks.dm index 944ef8d790a..6207f24793a 100644 --- a/code/modules/reqs/supplypacks.dm +++ b/code/modules/reqs/supplypacks.dm @@ -727,6 +727,11 @@ WEAPONS contains = list(/obj/item/ammo_magazine/flamer_tank/large/X) cost = 300 +/datum/supply_packs/weapons/napalm_G + name = "FL-84 G fuel tank" + contains = list(/obj/item/ammo_magazine/flamer_tank/large/G) + cost = 75 + /datum/supply_packs/weapons/back_fuel_tank name = "Standard back fuel tank" contains = list(/obj/item/ammo_magazine/flamer_tank/backtank) @@ -737,12 +742,33 @@ WEAPONS contains = list(/obj/item/ammo_magazine/flamer_tank/backtank/X) cost = 600 +/datum/supply_packs/weapons/mini_fuel_tank_x + name = "Type X back mini fuel tank" + contains = list(/obj/item/ammo_magazine/flamer_tank/mini/X) + cost = 20 + +/datum/supply_packs/weapons/back_fuel_tank_g + name = "Type G fuel tank" + contains = list(/obj/item/ammo_magazine/flamer_tank/backtank/G) + cost = 150 + +/datum/supply_packs/weapons/mini_fuel_tank_g + name = "Type G mini fuel tank" + contains = list(/obj/item/ammo_magazine/flamer_tank/mini/G) + cost = 5 + /datum/supply_packs/weapons/fueltank name = "X-fuel tank" contains = list(/obj/structure/reagent_dispensers/fueltank/xfuel) cost = 600 containertype = null +/datum/supply_packs/weapons/fueltank_g + name = "G-fuel tank" + contains = list(/obj/structure/reagent_dispensers/fueltank/gfuel) + cost = 150 + containertype = null + /datum/supply_packs/weapons/rpgoneuse name = "RL-72 Disposable RPG" contains = list(/obj/item/weapon/gun/launcher/rocket/oneuse) diff --git a/icons/effects/fire.dmi b/icons/effects/fire.dmi index 45e2c875afd..4654dd8fcc1 100644 Binary files a/icons/effects/fire.dmi and b/icons/effects/fire.dmi differ diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index b13013b755d..fbecc345e08 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/obj/items/ammo.dmi b/icons/obj/items/ammo.dmi index d65bf7a5aa7..0213742cec9 100644 Binary files a/icons/obj/items/ammo.dmi and b/icons/obj/items/ammo.dmi differ diff --git a/icons/obj/items/items_mini.dmi b/icons/obj/items/items_mini.dmi index bbaf2354e73..7ccbfdd554d 100644 Binary files a/icons/obj/items/items_mini.dmi and b/icons/obj/items/items_mini.dmi differ diff --git a/tgmc.dme b/tgmc.dme index c5b8159c877..5aaddb0ce65 100644 --- a/tgmc.dme +++ b/tgmc.dme @@ -59,8 +59,8 @@ #include "code\__DEFINES\factory.dm" #include "code\__DEFINES\fire_support.dm" #include "code\__DEFINES\flags.dm" -#include "code\__DEFINES\foam.dm" #include "code\__DEFINES\flame_color.dm" +#include "code\__DEFINES\foam.dm" #include "code\__DEFINES\footsteps.dm" #include "code\__DEFINES\generators.dm" #include "code\__DEFINES\greyscale.dm"