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

Nuke Ops Rework Phase 1

Browse Source
This commit is contained in:
Fox-McCloud
2014-11-03 23:45:00 -05:00
parent 2756be2d6c
commit 650c9a3e3c
14 changed files with 221 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/bullets.dm
+5 -5
View File
@@ -66,9 +66,9 @@
name = "buckshot shell"
desc = "A 12 gauge buckshot shell."
icon_state = "gshell"
projectile_type = /obj/item/projectile/bullet/buck
buck = 4
deviation = 1
projectile_type = "/obj/item/projectile/bullet/buck"
buck = 5
deviation = 0.8
/obj/item/ammo_casing/shotgun/birdshot
name = "birdshot shell"
@@ -98,7 +98,7 @@
name = "stun shell"
desc = "A stunning shell."
icon_state = "stunshell"
projectile_type = "/obj/item/projectile/bullet/stunshot"
projectile_type = "/obj/item/projectile/bullet/stunslug"
m_amt = 2500
@@ -106,7 +106,7 @@
name = "incendiary shell"
desc = "An incendiary shell"
icon_state = "ishell"
projectile_type = /obj/item/projectile/bullet/incendiary/shell
projectile_type = "/obj/item/projectile/bullet/incendiary/shell"
m_amt = 12500
code/modules/projectiles/projectile/bullets.dm
+26 -6
View File
@@ -15,6 +15,10 @@
return 1
return 0
/obj/item/projectile/bullet/weakbullet
damage = 5
stun = 5
weaken = 5
/obj/item/projectile/bullet/slug
name = "slug"
@@ -49,7 +53,7 @@
/obj/item/projectile/bullet/midbullet12
damage = 25
damage = 20
stun = 5
weaken = 5
@@ -90,13 +94,21 @@
embed = 0
edge = 1
/obj/item/projectile/bullet/stunshot
name = "stunshot"
damage = 5
stun = 10
weaken = 10
stutter = 10
stun = 5
weaken = 5
stutter = 5
embed = 0
sharp = 0
/obj/item/projectile/bullet/stunslug
name = "stunslug"
damage = 5
stun = 5
weaken = 5
stutter = 5
embed = 0
sharp = 0
@@ -107,15 +119,23 @@
/obj/item/projectile/bullet/incendiary
/obj/item/projectile/bullet/incendiary/on_hit(var/atom/target, var/blocked = 0)
..()
if(istype(target, /mob/living/carbon))
var/mob/living/carbon/M = target
M.adjust_fire_stacks(1)
M.IgniteMob()
/obj/item/projectile/bullet/incendiary/shell
name = "incendiary slug"
damage = 20
/obj/item/projectile/bullet/incendiary/mech
/obj/item/projectile/bullet/incendiary/shell/Move()
..()
var/turf/location = get_turf(src)
location.hotspot_expose(700, 50, 1)
/obj/item/projectile/bullet/incendiary/shell/dragonsbreath
name = "dragonsbreath round"
damage = 5
/obj/item/projectile/bullet/mime