Fixed couple of holster messages typos.

Reworked way isHolster() works.
Fixed bug with detecive revolver, making it impossible to reload.
This commit is contained in:
Chinsky
2012-10-25 16:32:57 +04:00
parent 236780d8c6
commit eb72f2d48e
8 changed files with 26 additions and 20 deletions

View File

@@ -131,20 +131,4 @@
/obj/item/weapon/gun/proc/isHandgun()
if(istype(src,/obj/item/weapon/gun/projectile/shotgun))
return 0
if(istype(src,/obj/item/weapon/gun/projectile/automatic))
return 0
if(istype(src,/obj/item/weapon/gun/energy/lasercannon))
return 0
if(istype(src,/obj/item/weapon/gun/energy/pulse_rifle))
return 0
if(istype(src,/obj/item/weapon/gun/energy/ionrifle))
return 0
if(istype(src,/obj/item/weapon/gun/energy/ionrifle))
return 0
if(istype(src,/obj/item/weapon/gun/energy/decloner))
return 0
if(istype(src,/obj/item/weapon/gun/energy/staff))
return 0
return 1

View File

@@ -71,6 +71,8 @@ obj/item/weapon/gun/energy/laser/retro
origin_tech = "combat=4;materials=3;powerstorage=3"
projectile_type = "/obj/item/projectile/beam/heavylaser"
isHandgun()
return 0
/obj/item/weapon/gun/energy/xray
name = "xray laser gun"

View File

@@ -32,6 +32,8 @@
projectile_type = "/obj/item/projectile/beam/pulse"
return
isHandgun()
return 0
/obj/item/weapon/gun/energy/pulse_rifle/destroyer
name = "pulse destroyer"
@@ -49,4 +51,7 @@
icon_state = "m1911-p"
cell_type = "/obj/item/weapon/cell/infinite"
isHandgun()
return 1

View File

@@ -17,6 +17,9 @@
else
return
isHandgun()
return 0
/obj/item/weapon/gun/energy/decloner
name = "biological demolecularisor"
desc = "A gun that discharges high amounts of controlled radiation to slowly break a target into component elements."
@@ -26,6 +29,9 @@
charge_cost = 100
projectile_type = "/obj/item/projectile/energy/declone"
isHandgun()
return 0
obj/item/weapon/gun/energy/staff
name = "staff of change"
desc = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself"
@@ -62,6 +68,9 @@ obj/item/weapon/gun/energy/staff
update_icon()
return 1
isHandgun()
return 0
/obj/item/weapon/gun/energy/floragun
name = "floral somatoray"
desc = "A tool that discharges controlled radiation which induces mutation in plant cells."

View File

@@ -8,6 +8,8 @@
origin_tech = "combat=4;materials=2"
ammo_type = "/obj/item/ammo_casing/c9mm"
isHandgun()
return 0
/obj/item/weapon/gun/projectile/automatic/mini_uzi
@@ -20,6 +22,8 @@
origin_tech = "combat=5;materials=2;syndicate=8"
ammo_type = "/obj/item/ammo_casing/c45"
isHandgun()
return 1
/obj/item/weapon/gun/projectile/automatic/c20r

View File

@@ -4,7 +4,7 @@
icon_state = "detective"
caliber = "38"
origin_tech = "combat=2;materials=2"
ammo_type = "/obj/item/ammo_casing/c38"
ammo_type = "/obj/item/ammo_magazine/c38"
/*
special_check(var/mob/living/carbon/human/M)

View File

@@ -15,6 +15,8 @@
var/pumped = 0
var/obj/item/ammo_casing/current_shell = null
isHandgun()
return 0
load_into_chamber()
if(in_chamber)