cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-12 15:42:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8290 from mwerezak/gun-rewrite

Browse Source 
Fixes captain's laser gun
This commit is contained in:
Zuhayr
2015-02-26 16:28:43 +10:30
parent 234273605e ec59f8ab07
commit bceb01c233
9 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/displaycase.dm
+4 -4
View File
@@ -15,7 +15,7 @@
if (1)
new /obj/item/weapon/shard( src.loc )
if (occupied)
new /obj/item/weapon/gun/energy/laser/captain( src.loc )
new /obj/item/weapon/gun/energy/captain( src.loc )
occupied = 0
del(src)
if (2)
@@ -39,14 +39,14 @@
if (prob(75))
new /obj/item/weapon/shard( src.loc )
if (occupied)
new /obj/item/weapon/gun/energy/laser/captain( src.loc )
new /obj/item/weapon/gun/energy/captain( src.loc )
occupied = 0
del(src)
/obj/structure/displaycase/meteorhit(obj/O as obj)
new /obj/item/weapon/shard( src.loc )
new /obj/item/weapon/gun/energy/laser/captain( src.loc )
new /obj/item/weapon/gun/energy/captain( src.loc )
del(src)
@@ -78,7 +78,7 @@
/obj/structure/displaycase/attack_hand(mob/user as mob)
if (src.destroyed && src.occupied)
new /obj/item/weapon/gun/energy/laser/captain( src.loc )
new /obj/item/weapon/gun/energy/captain( src.loc )
user << "\b You deactivate the hover field built into the case."
src.occupied = 0
src.add_fingerprint(user)