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

further conflicts and bugfixes

Browse Source
This commit is contained in:
paprka
2015-01-15 21:59:36 -08:00
parent ab7d50c90e
commit eae84c1c39
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/wizard/rightandwrong.dm
+2 -4
View File
@@ -60,7 +60,7 @@
if("mateba")
new /obj/item/weapon/gun/projectile/revolver/mateba(get_turf(H))
if("crossbow")
new /obj/item/weapon/gun/projectile/automatic/crossbow(get_turf(H))
new /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow/large(get_turf(H))
if("nuclear")
var/obj/item/weapon/gun/energy/gun/nuclear/gat
gat.pin = /obj/item/device/firing_pin //no authentication pins for spawned guns. fun allowed.
@@ -86,9 +86,7 @@
gat.pin = /obj/item/device/firing_pin
new gat(get_turf(H))
if("speargun")
var/obj/item/weapon/gun/projectile/automatic/speargun/gat
gat.pin = /obj/item/device/firing_pin
new gat(get_turf(H))
new /obj/item/weapon/gun/projectile/automatic/speargun(get_turf(H))
else
switch (randomizemagic)
if("fireball")
code/game/objects/items/toys.dm
+1 -1
View File
@@ -190,7 +190,7 @@
name = "foam dart crossbow"
desc = "A weapon favored by many overactive children. Ages 8 and up."
icon = 'icons/obj/gun.dmi'
icon_state = "crossbow"
icon_state = "crossbow100"
item_state = "crossbow"
w_class = 2.0
attack_verb = list("attacked", "struck", "hit")