cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 13:38:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into w_class

Browse Source 
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
This commit is contained in:
Mervill
2016-12-02 21:44:24 -08:00
parent 19513c398c ca6ffdba40
commit c2e2440953
95 changed files with 272 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/magic/staff.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/obj/item/weapon/gun/magic/staff/
/obj/item/weapon/gun/magic/staff
slot_flags = SLOT_BACK
/obj/item/weapon/gun/magic/staff/change
code/modules/projectiles/guns/magic/wand.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/obj/item/weapon/gun/magic/wand/
/obj/item/weapon/gun/magic/wand
name = "wand of nothing"
desc = "It's not just a stick, it's a MAGIC stick!"
ammo_type = /obj/item/ammo_casing/magic