saw and bulldog changes fight me kiddo 1v1

This commit is contained in:
MMMiracles
2016-01-25 20:58:38 -05:00
parent 3588d1e624
commit 045f2d480b
7 changed files with 35 additions and 11 deletions

View File

@@ -142,6 +142,12 @@
icon_state = "mshell" icon_state = "mshell"
projectile_type = /obj/item/projectile/bullet/meteorshot projectile_type = /obj/item/projectile/bullet/meteorshot
/obj/item/ammo_casing/shotgun/breaching
name = "breaching shell"
desc = "An economic version of the meteorshot, utilizing similar technologies. Great for busting down doors."
icon_state = "mshell"
projectile_type = /obj/item/projectile/bullet/meteorshot/weak
/obj/item/ammo_casing/shotgun/pulseslug /obj/item/ammo_casing/shotgun/pulseslug
name = "pulse slug" name = "pulse slug"
desc = "A delicate device which can be loaded into a shotgun. The primer acts as a button which triggers the gain medium and fires a powerful \ desc = "A delicate device which can be loaded into a shotgun. The primer acts as a button which triggers the gain medium and fires a powerful \

View File

@@ -304,6 +304,11 @@ obj/item/ammo_box/magazine/tommygunm45
icon_state = "m12gt" icon_state = "m12gt"
ammo_type = /obj/item/ammo_casing/shotgun/dart/bioterror ammo_type = /obj/item/ammo_casing/shotgun/dart/bioterror
/obj/item/ammo_box/magazine/m12g/breach
name = "shotgun magazine (12g breacher slugs)"
icon_state = "m12gbc"
ammo_type = /obj/item/projectile/bullet/meteorshot/weak
/obj/item/ammo_box/magazine/toy /obj/item/ammo_box/magazine/toy
name = "foam force META magazine" name = "foam force META magazine"
ammo_type = /obj/item/ammo_casing/caseless/foam_dart ammo_type = /obj/item/ammo_casing/caseless/foam_dart

View File

@@ -27,6 +27,7 @@
/obj/item/weapon/gun/projectile/automatic/l6_saw/update_icon() /obj/item/weapon/gun/projectile/automatic/l6_saw/update_icon()
icon_state = "l6[cover_open ? "open" : "closed"][magazine ? Ceiling(get_ammo(0)/12.5)*25 : "-empty"]" icon_state = "l6[cover_open ? "open" : "closed"][magazine ? Ceiling(get_ammo(0)/12.5)*25 : "-empty"]"
item_state = "l6[cover_open ? "openmag" : "closedmag"]"
/obj/item/weapon/gun/projectile/automatic/l6_saw/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params) //what I tried to do here is just add a check to see if the cover is open or not and add an icon_state change because I can't figure out how c-20rs do it with overlays /obj/item/weapon/gun/projectile/automatic/l6_saw/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params) //what I tried to do here is just add a check to see if the cover is open or not and add an icon_state change because I can't figure out how c-20rs do it with overlays
@@ -64,35 +65,35 @@
/obj/item/projectile/bullet/saw /obj/item/projectile/bullet/saw
damage = 35 damage = 45
armour_penetration = 5 armour_penetration = 5
/obj/item/projectile/bullet/saw/bleeding /obj/item/projectile/bullet/saw/bleeding
damage = 15 damage = 20
armour_penetration = 0 armour_penetration = 0
/obj/item/projectile/bullet/saw/bleeding/on_hit(atom/target, blocked = 0, hit_zone) /obj/item/projectile/bullet/saw/bleeding/on_hit(atom/target, blocked = 0, hit_zone)
if((blocked != 100) && istype(target, /mob/living/carbon/human)) if((blocked != 100) && istype(target, /mob/living/carbon/human))
var/mob/living/carbon/human/H = target var/mob/living/carbon/human/H = target
H.drip(25) H.drip(35)
/obj/item/projectile/bullet/saw/hollow /obj/item/projectile/bullet/saw/hollow
damage = 45 damage = 60
armour_penetration = 0 armour_penetration = -10
/obj/item/projectile/bullet/saw/ap /obj/item/projectile/bullet/saw/ap
damage = 30 damage = 35
armour_penetration = 35 armour_penetration = 35
/obj/item/projectile/bullet/saw/incen /obj/item/projectile/bullet/saw/incen
damage = 5 damage = 7
armour_penetration = 0 armour_penetration = 0
/obj/item/projectile/bullet/saw/incen/on_hit(atom/target, blocked = 0) /obj/item/projectile/bullet/saw/incen/on_hit(atom/target, blocked = 0)
. = ..() . = ..()
if(iscarbon(target)) if(iscarbon(target))
var/mob/living/carbon/M = target var/mob/living/carbon/M = target
M.adjust_fire_stacks(1) M.adjust_fire_stacks(3)
M.IgniteMob() M.IgniteMob()

View File

@@ -296,7 +296,7 @@
item_state = "bulldog" item_state = "bulldog"
w_class = 3 w_class = 3
origin_tech = "combat=5;materials=4;syndicate=6" origin_tech = "combat=5;materials=4;syndicate=6"
mag_type = /obj/item/ammo_box/magazine/m12g mag_type = /obj/item/ammo_box/magazine/m12g/stun
fire_sound = 'sound/weapons/Gunshot.ogg' fire_sound = 'sound/weapons/Gunshot.ogg'
can_suppress = 0 can_suppress = 0
burst_size = 1 burst_size = 1

View File

@@ -72,7 +72,7 @@
. = ..() . = ..()
if(iscarbon(target)) if(iscarbon(target))
var/mob/living/carbon/M = target var/mob/living/carbon/M = target
M.adjust_fire_stacks(1) M.adjust_fire_stacks(4)
M.IgniteMob() M.IgniteMob()
@@ -101,6 +101,11 @@
stun = 8 stun = 8
hitsound = 'sound/effects/meteorimpact.ogg' hitsound = 'sound/effects/meteorimpact.ogg'
/obj/item/projectile/bullet/meteorshot/weak
damage = 10
weaken = 4
stun = 4
/obj/item/projectile/bullet/meteorshot/on_hit(atom/target, blocked = 0) /obj/item/projectile/bullet/meteorshot/on_hit(atom/target, blocked = 0)
. = ..() . = ..()
if(istype(target, /atom/movable)) if(istype(target, /atom/movable))

View File

@@ -378,6 +378,7 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
name = "12g Slug Drum" name = "12g Slug Drum"
desc = "An additional 8-round slug magazine for use with the Bulldog shotgun. \ desc = "An additional 8-round slug magazine for use with the Bulldog shotgun. \
Now 8 times less likely to shoot your pals." Now 8 times less likely to shoot your pals."
cost = 3
item = /obj/item/ammo_box/magazine/m12g item = /obj/item/ammo_box/magazine/m12g
/datum/uplink_item/ammo/shotgun/slug /datum/uplink_item/ammo/shotgun/slug
@@ -385,7 +386,6 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
desc = "An alternative 8-round stun slug magazine for use with the Bulldog shotgun. \ desc = "An alternative 8-round stun slug magazine for use with the Bulldog shotgun. \
Saying that they're completely non-lethal would be lying." Saying that they're completely non-lethal would be lying."
item = /obj/item/ammo_box/magazine/m12g/stun item = /obj/item/ammo_box/magazine/m12g/stun
cost = 3
include_modes = list(/datum/game_mode/nuclear) include_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/ammo/shotgun/dragon /datum/uplink_item/ammo/shotgun/dragon
@@ -395,6 +395,13 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
item = /obj/item/ammo_box/magazine/m12g/dragon item = /obj/item/ammo_box/magazine/m12g/dragon
include_modes = list(/datum/game_mode/nuclear) include_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/ammo/shotgun/breach
name = "12g Breaching Shells"
desc = "An economic variant of the CMC meteorshot slugs, not as effective for knocking \
down targets, but still great for blasting airlocks off their frames."
item = /obj/item/ammo_box/magazine/m12g/breach
include_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/ammo/shotgun/bag /datum/uplink_item/ammo/shotgun/bag
name = "12g Ammo Duffelbag" name = "12g Ammo Duffelbag"
desc = "A duffelbag filled with enough 12g ammo to supply an entire team, at a discounted price." desc = "A duffelbag filled with enough 12g ammo to supply an entire team, at a discounted price."

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB