cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds incendiary shotgun shells available via hacked autolathes in a new subclass of incendiary bullets and gave chemical dart shells their own sprites.

Browse Source 
Conflicts:
	code/game/machinery/autolathe.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/modules/projectiles/ammunition/bullets.dm
	code/modules/projectiles/projectile/bullets.dm
	icons/obj/ammo.dmi
This commit is contained in:
TZK13
2014-02-26 12:05:41 -06:00
committed by ZomgPonies
parent dc1a375c74
commit 0a83349284
5 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/autolathe.dm
+1
View File
@@ -46,6 +46,7 @@ var/global/list/autolathe_recipes = list( \
new /obj/item/ammo_casing/shotgun/beanbag(), \
new /obj/item/weapon/storage/box/blanks(), \
new /obj/item/ammo_casing/shotgun(), \
new /obj/item/ammo_casing/shotgun/incendiary(), \
new /obj/item/ammo_box/c38(), \
new /obj/item/ammo_box/a357(), \
new /obj/item/clothing/ears/earmuffs/tribblemuffs(), \
code/game/mecha/equipment/weapons/weapons.dm
+1 -1
View File
@@ -200,7 +200,7 @@
name = "\improper FNX-66 Carbine"
icon_state = "mecha_carbine"
equip_cooldown = 5
projectile = /obj/item/projectile/bullet/incendiary
projectile = /obj/item/projectile/bullet/incendiary/mech
projectiles = 24
projectile_energy_cost = 15
code/modules/projectiles/ammunition/bullets.dm
+13 -5
View File
@@ -102,11 +102,19 @@
m_amt = 2500
/obj/item/ammo_casing/shotgun/incendiary
name = "incendiary shell"
desc = "An incendiary shell"
icon_state = "ishell"
projectile_type = /obj/item/projectile/bullet/incendiary/shell
m_amt = 12500
/obj/item/ammo_casing/shotgun/dart
name = "shotgun darts"
desc = "A dart for use in shotguns."
icon_state = "dart"
projectile_type = "/obj/item/projectile/energy/dart"
name = "shotgun dart"
desc = "A dart for use in shotguns. Can be injected with up to 30 units of any chemical."
icon_state = "cshell"
projectile_type = /obj/item/projectile/bullet/dart
m_amt = 12500
obj/item/ammo_casing/shotgun/dart/New()
@@ -134,4 +142,4 @@ obj/item/ammo_casing/shotgun/dart/New()
projectile_type = /obj/item/projectile/bullet
//select_name = "kinetic"
//e_cost = 500
//fire_sound = 'sound/weapons/Gunshot4.ogg'
//fire_sound = 'sound/weapons/Gunshot4.ogg'
code/modules/projectiles/projectile/bullets.dm
+7 -2
View File
@@ -98,8 +98,6 @@
/obj/item/projectile/bullet/incendiary
name = "incendiary bullet"
damage = 20
/obj/item/projectile/bullet/incendiary/on_hit(var/atom/target, var/blocked = 0)
if(istype(target, /mob/living/carbon))
@@ -107,6 +105,13 @@
M.adjust_fire_stacks(1)
M.IgniteMob()
/obj/item/projectile/bullet/incendiary/shell
damage = 20
/obj/item/projectile/bullet/incendiary/mech
damage = 5
/*
/obj/item/projectile/bullet/dart
name = "dart"