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/gamemodes/nuclear/pinpointer.dm
+5 -4
View File
@@ -170,12 +170,13 @@
/obj/item/weapon/pinpointer/nukeop/attack_self(mob/user as mob)
if(!active)
active = 1
var/mode_text = "Authentication Disk Locator mode"
if(!mode)
workdisk()
user << "<span class='notice'>Authentication Disk Locator active.</span>"
else
mode_text = "Shuttle Locator mode"
worklocation()
user << "<span class='notice'>Shuttle Locator active.</span>"
user << "<span class='notice'>You activate the pinpointer([mode_text]).</span>"
else
active = 0
icon_state = "pinoff"
@@ -191,7 +192,7 @@
mode = 1 //Ensures worklocation() continues to work
worklocation()
playsound(loc, 'sound/machines/twobeep.ogg', 50, 1) //Plays a beep
visible_message("Shuttle Locator active.") //Lets the mob holding it know that the mode has changed
visible_message("Shuttle Locator mode actived.") //Lets the mob holding it know that the mode has changed
return //Get outta here
scandisk()
if(!the_disk)
@@ -221,7 +222,7 @@
mode = 0
workdisk()
playsound(loc, 'sound/machines/twobeep.ogg', 50, 1)
visible_message("<span class='notice'>Authentication Disk Locator active.</span>")
visible_message("<span class='notice'>Authentication Disk Locator mode actived.</span>")
return
if(!home)
home = SSshuttle.getShuttle("syndicate")
code/game/machinery/computer/shuttle.dm
+1 -1
View File
@@ -87,7 +87,7 @@
return prob(60)
var/obj/structure/stool/bed/B = A
if (istype(A, /obj/structure/stool/bed) && B.buckled_mob)//if it's a bed/chair and someone is buckled, it will not pass
if (istype(A, /obj/structure/stool/bed) && (B.buckled_mob || B.density))//if it's a bed/chair and is dense or someone is buckled, it will not pass
return 0
else if(istype(A, /mob/living)) // You Shall Not Pass!
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