cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing Charging bugs and Breeder bugs (#1296)

Browse Source 
Breeders now need to breathe again.
Sanity check for any gun that requires charging has been added. It's not been added to the master special_check and firing procs yet because weapons that need to charge remain fairly edge case.
This commit is contained in:
LordFowl
2016-12-25 20:50:12 +02:00
committed by skull132
parent 93600f51b5
commit f1897e2ffb
5 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/vaurca_items.dm
+7 -5
View File
@@ -37,15 +37,17 @@
/obj/item/weapon/melee/energy/vaurca/activate(mob/living/user)
..()
icon_state = "eknife1"
item_state = "eknife0"
item_state = icon_state
damtype = "fire"
user.regenerate_icons()
user << "<span class='notice'>\The [src] is now energised.</span>"
/obj/item/weapon/melee/energy/vaurca/deactivate(mob/living/user)
..()
icon_state = "eknife0"
item_state = "eknife0"
item_state = icon_state
damtype = "brute"
user.regenerate_icons()
user << "<span class='notice'>\The [src] is de-energised.</span>"
/obj/item/vaurca/box
@@ -57,14 +59,14 @@
/obj/item/vaurca/box/attack_self(mob/user as mob)
if(isvaurca(src))
if(isvaurca(user))
user << "<span class='notice'>You are familiar with the box's solution, and open it to reveal an ancient thing. How tedious.</span>"
var/obj/item/weapon/archaeological_find/X = new /obj/item/weapon/archaeological_find
user.remove_from_mob(src)
user.put_in_hands(X)
qdel(src)
else if(isipc(src))
else if(isipc(user))
user << "<span class='notice'>You analyze the box's markings, and begin to calculate with robotic efficiency every possible combination. (You must stand still to complete the puzzle box.)</span>"
if(do_after(user, 100))
user << "<span class='notice'>Calculations complete. You begin to brute-force the box with a mechanical determination.</span>"
@@ -75,7 +77,7 @@
user.put_in_hands(X)
qdel(src)
else if(isvox(src))
else if(isvox(user))
user << "<span class='notice'>You are surprised to recognize the markings of the Apex, the Masters! You know this thing... (You must stand still to complete the puzzle box.)</span>"
if(do_after(user, 100))
user << "<span class='notice'>After a few seconds of remembering, you input the solution to the riddle - a lovely riddle indeed - and open the box to reveal an ancient thing.</span>"