TG: Fixed projectiles going into disposals.

Made the rapid syringe gun a subtype of the syringe gun, and reduced it's
capacity to four syringes.
Fixed the examine bug on syringe guns.
Added a new sprite for the regular syringe gun.

Added a new door for research. It's also used in robotics.

Updated the air injector sprite.

Fixed some pepperspray spelling errors.

~~REMOVED~~: the energy crossbow and chemsprayer from R&D.
This commit is contained in:
Ren Erthilo
2012-04-23 21:40:36 +01:00
parent f88da57e57
commit 60caca6a2a
5 changed files with 10 additions and 6 deletions
+2
View File
@@ -598,6 +598,8 @@
var/turf/trg = get_turf(target)
var/obj/effect/syringe_gun_dummy/D = new/obj/effect/syringe_gun_dummy(get_turf(src))
var/obj/item/weapon/reagent_containers/syringe/S = syringes[1]
if((!S) || (!S.reagents)) //ho boy! wot runtimes!
return
S.reagents.trans_to(D, S.reagents.total_volume)
syringes -= S
del(S)
+2
View File
@@ -478,6 +478,8 @@
CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if (istype(mover,/obj/item))
var/obj/item/I = mover
if(istype(I, /obj/item/weapon/dummy) || istype(I, /obj/item/projectile))
return
if(!mover.throwing)
return ..()
if(prob(75))
+4 -4
View File
@@ -1315,7 +1315,7 @@ datum
materials = list("$gold" = 5000,"$uranium" = 10000, "mutagen" = 40)
build_path = "/obj/item/weapon/gun/energy/decloner"
locked = 1
/*
chemsprayer
name = "Chem Sprayer"
desc = "An advanced chem spraying device."
@@ -1325,7 +1325,7 @@ datum
materials = list("$metal" = 5000, "$glass" = 1000)
reliability_base = 100
build_path = "/obj/item/weapon/chemsprayer"
*/
rapidsyringe
name = "Rapid Syringe Gun"
desc = "A gun that fires many syringes."
@@ -1334,7 +1334,7 @@ datum
build_type = PROTOLATHE
materials = list("$metal" = 5000, "$glass" = 1000)
build_path = "/obj/item/weapon/gun/syringe/rapidsyringe"
/*
largecrossbow
name = "Energy Crossbow"
desc = "A weapon favoured by syndicate infiltration teams."
@@ -1343,7 +1343,7 @@ datum
build_type = PROTOLATHE
materials = list("$metal" = 5000, "$glass" = 1000, "$uranium" = 1000, "$silver" = 1000)
build_path = "/obj/item/weapon/gun/energy/crossbow/largecrossbow"
*/
temp_gun
name = "Temperature Gun"
desc = "A gun that shoots temperature bullet energythings to change temperature."//Change it if you want