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

Merge pull request #8969 from phil235/BundleFix2

Browse Source 
Another bundle of fixes
This commit is contained in:
Cheridan
2015-04-15 21:08:13 -05:00
parent a9002da949 d6c9a5158d
commit 87edea4eab
8 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/defib.dm
+1 -1
View File
@@ -257,7 +257,7 @@
update_icon()
return
/obj/item/weapon/defibrillator/compact/combat/attackby(obj/item/weapon/W, mob/user, params)
/obj/item/weapon/defibrillator/compact/combat/loaded/attackby(obj/item/weapon/W, mob/user, params)
if(W == paddles)
paddles.unwield()
toggle_paddles()
code/game/objects/structures/crates_lockers/closets/secure/misc.dm
+1 -1
View File
@@ -49,7 +49,7 @@
new /obj/item/weapon/storage/firstaid/brute(src)
new /obj/item/weapon/storage/firstaid/regular(src)
new /obj/item/weapon/melee/baton/loaded(src)
new /obj/item/weapon/defibrillator/compact/combat(src)
new /obj/item/weapon/defibrillator/compact/combat/loaded(src)
new /obj/machinery/bot/medbot(src)
/obj/structure/closet/secure_closet/ertEngi