Captain voidsuit, rolling up sleeves and minor fixes/tweaks (#1247)

-added BRAINOS corporate sprites
-added BRAINOS captain vodsuit sprite, with a cicler mapped in the captains office
-fixed some red sec scum decals
-removed the dumb gun help intent thing
-added rolling up sleeves
-fixed some minor things with the merge, like wrong e-pistol names, besides changing the fire-rate and flashbangs missing in sec lockers
This commit is contained in:
Alberyk
2016-12-19 02:07:59 +02:00
committed by skull132
parent a96f896138
commit 7267ec826c
26 changed files with 108 additions and 32 deletions
+1 -3
View File
@@ -135,9 +135,7 @@
if(user && user.client && user.aiming && user.aiming.active && user.aiming.aiming_at != A)
PreFire(A,user,params) //They're using the new gun system, locate what they're aiming at.
return
if(user && user.a_intent == I_HELP) //regardless of what happens, refuse to shoot if help intent is on
user << "<span class='warning'>You refrain from firing your [src] as your intent is set to help.</span>"
else
Fire(A,user,params) //Otherwise, fire normally.
@@ -118,13 +118,13 @@
fire_sound = 'sound/weapons/Taser.ogg'
slot_flags = SLOT_BELT|SLOT_HOLSTER
max_shots = 5
fire_delay = 2
fire_delay = 4
projectile_type = /obj/item/projectile/beam/stun
origin_tech = "combat=3;magnets=2"
modifystate = "epistolstun"
firemodes = list(
list(name="stun", projectile_type=/obj/item/projectile/beam/stun, modifystate="epistolstun", fire_sound='sound/weapons/Taser.ogg'),
list(name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="epistolkill", fire_sound='sound/weapons/Laser.ogg'),
list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun, modifystate="epistolstun", fire_sound='sound/weapons/Taser.ogg'),
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="epistolkill", fire_sound='sound/weapons/Laser.ogg'),
)