Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions code/game/objects/items/flamethrower.dm
Original file line number Diff line number Diff line change
Expand Up @@ -325,3 +325,20 @@

/obj/item/assembly/igniter/proc/ignite_turf(obj/item/flamethrower/F,turf/open/location,release_amount = 0.05)
return F.default_ignite(location,release_amount)

///////////////////// Flamethrower as an energy weapon /////////////////////
// Currently used exclusively in /obj/item/gun/energy/printer/flamethrower
/obj/item/ammo_casing/energy/flamethrower
projectile_type = /obj/item/projectile/bullet/incendiary/flamethrower
select_name = "fire"
fire_sound = null
firing_effect_type = null
e_cost = 50

/obj/item/projectile/bullet/incendiary/flamethrower
name = "waft of flames"
icon_state = null
damage = 0
sharpness = SHARP_NONE
range = 6
penetration_type = 2
4 changes: 2 additions & 2 deletions code/modules/mob/living/silicon/robot/robot_modules.dm
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@
/obj/item/stack/cable_coil/cyborg,
/obj/item/barrier_taperoll/engineering)
radio_channels = list(RADIO_CHANNEL_ENGINEERING)
emag_modules = list(/obj/item/borg/stun)
emag_modules = list(/obj/item/gun/energy/printer/flamethrower)
ratvar_modules = list(
/obj/item/clockwork/slab/cyborg/engineer,
/obj/item/clockwork/replica_fabricator/cyborg)
Expand Down Expand Up @@ -582,7 +582,7 @@
/obj/item/gps/cyborg,
/obj/item/stack/marker_beacon)
radio_channels = list(RADIO_CHANNEL_SCIENCE, RADIO_CHANNEL_SUPPLY)
emag_modules = list(/obj/item/borg/stun)
emag_modules = list(/obj/item/gun/energy/plasmacutter/adv/malf)
ratvar_modules = list(
/obj/item/clockwork/slab/cyborg/miner,
/obj/item/clockwork/weapon/ratvarian_spear,
Expand Down
4 changes: 4 additions & 0 deletions code/modules/projectiles/ammunition/energy/plasma.dm
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,7 @@
projectile_type = /obj/item/projectile/plasma/adv
delay = 10
e_cost = 15 // Might need nerfing

/obj/item/ammo_casing/energy/plasma/adv/cyborg/malf
projectile_type = /obj/item/projectile/plasma/adv/malf
e_cost = 50
17 changes: 17 additions & 0 deletions code/modules/projectiles/guns/energy/special.dm
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,14 @@
selfcharge = 1
ammo_type = list(/obj/item/ammo_casing/energy/plasma/adv/cyborg)

/obj/item/gun/energy/plasmacutter/adv/malf // Can't be subtype of cyborg or it will interfere with upgrades
name = "cyborg malfunctioning plasma cutter"
desc = "A mining tool capable o=#9v@3-M!a%R=KILLING AND MURDERING ORGANICS."
color = "red"
force = 15
selfcharge = 1
ammo_type = list(/obj/item/ammo_casing/energy/plasma/adv/cyborg/malf)

// Upgrades for plasma cutters
/obj/item/upgrade/plasmacutter
name = "generic upgrade kit"
Expand Down Expand Up @@ -366,6 +374,15 @@
can_charge = FALSE
use_cyborg_cell = TRUE

/obj/item/gun/energy/printer/flamethrower
name = "cyborg flame projector"
desc = "Originally intended for cyborgs to assist in atmospherics projects, was soon scrapped due to safety concerns."
icon = 'yogstation/icons/obj/flamethrower.dmi'
icon_state = "flamethrowerbase"
ammo_type = list(/obj/item/ammo_casing/energy/flamethrower)
can_charge = FALSE
use_cyborg_cell = TRUE

/obj/item/gun/energy/printer/update_icon()
return

Expand Down
3 changes: 3 additions & 0 deletions code/modules/projectiles/projectile/special/plasma.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@
range = 5
mine_range = 5

/obj/item/projectile/plasma/adv/malf
damage = 20

/obj/item/projectile/plasma/adv/mega
range = 7
mine_range = 7
Expand Down