Fixes-Tweakes

This commit is contained in:
Fox-McCloud
2014-12-14 03:18:10 -05:00
parent ab7bd372f9
commit fece84d974
20 changed files with 151 additions and 123 deletions
@@ -109,12 +109,12 @@
desc = "A high-tech shotgun shell which can be loaded with materials to produce unique effects."
icon_state = "cshell"
projectile_type = null
/*
/obj/item/ammo_casing/shotgun/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
projectile_type = "/obj/item/projectile/bullet/dart"
/obj/item/ammo_casing/shotgun/dart/New()
..()
@@ -124,7 +124,6 @@
/obj/item/ammo_casing/shotgun/dart/attackby()
return
*/
/obj/item/ammo_casing/shotgun/fakebeanbag
name = "beanbag shell"
@@ -127,7 +127,7 @@
caliber = ".45"
max_ammo = 20
/obj/item/ammo_box/magazine/smgm/update_icon()
/obj/item/ammo_box/magazine/smgm45/update_icon()
..()
icon_state = "[initial(icon_state)]-[round(ammo_count(),2)]"
+2 -2
View File
@@ -46,7 +46,7 @@
else
icon_state = "energy0"
/*
attackby(obj/item/weapon/W, mob/user)
if(istype(W, /obj/item/weapon/cell))
if(!power_supply)
@@ -73,4 +73,4 @@
set src in view(1)
..()
if(!power_supply)
usr <<"<span class='warning'>The weapon does not have a power source installed.</span>"
usr <<"<span class='warning'>The weapon does not have a power source installed.</span>" */
@@ -136,7 +136,7 @@
var/mob/living/carbon/M = target
M.silent = max(M.silent, 10)
/*
/obj/item/projectile/bullet/dart
@@ -161,7 +161,7 @@
flags &= ~NOREACT
reagents.handle_reactions()
return 1
*/
/obj/item/projectile/bullet/dart/metalfoam
New()
..()