cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 21:19:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4224 from Ccomp5950/bug_fixes

Browse Source 
Bug fixes
This commit is contained in:
Zuhayr
2014-01-07 02:36:51 -08:00
parent c94486b0c4 1575db6320
commit a039f05372
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/bots/cleanbot.dm
+2
View File
@@ -54,6 +54,8 @@
src.botcard = new /obj/item/weapon/card/id(src)
var/datum/job/janitor/J = new/datum/job/janitor
src.botcard.access = J.get_access()
src.locked = 0 // Start unlocked so roboticist can set them to patrol.
if(radio_controller)
radio_controller.add_object(src, beacon_freq, filter = RADIO_NAVBEACONS)
code/game/objects/effects/decals/Cleanable/misc.dm
+1 -1
View File
@@ -41,7 +41,7 @@
icon_state = "dirt"
/obj/effect/decal/cleanable/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W,/obj/item/weapon/crowbar))
if(!istype(W,/obj/item/weapon/mop) && !istype(W,/obj/item/weapon/soap))
var/turf/T = get_turf(src)
if(T)
T.attackby(W,user)
code/game/objects/items/devices/PDA/PDA.dm
+3 -4
View File
@@ -943,10 +943,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
else
//Basic safety check. If either both objects are held by user or PDA is on ground and card is in hand.
if(((src in user.contents) && (C in user.contents)) || (istype(loc, /turf) && in_range(src, user) && (C in user.contents)) )
if( can_use(user) )//If they can still act.
id_check(user, 2)
user << "<span class='notice'>You put the ID into \the [src]'s slot.</span>"
updateSelfDialog()//Update self dialog on success.
id_check(user, 2)
user << "<span class='notice'>You put the ID into \the [src]'s slot.</span>"
updateSelfDialog()//Update self dialog on success.
return //Return in case of failed check or when successful.
updateSelfDialog()//For the non-input related code.
else if(istype(C, /obj/item/device/paicard) && !src.pai)
code/modules/mob/dead/observer/say.dm
+3 -3
View File
@@ -1,5 +1,5 @@
/mob/dead/observer/say(var/message)
message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
message = trim(copytext(message, 1, MAX_MESSAGE_LEN))
if (!message)
return
@@ -18,7 +18,7 @@
/mob/dead/observer/emote(var/act, var/type, var/message)
message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
message = trim(copytext(message, 1, MAX_MESSAGE_LEN))
if(!message)
return
@@ -62,4 +62,4 @@
M.show_message("<span class='game'><i>You hear muffled speech... you can almost make out some words...</i></span>", 2)
// M.show_message("<span class='game'><i>[stutter(message)]</i></span>", 2)
playsound(src.loc, pick('sound/effects/ghost.ogg','sound/effects/ghost2.ogg'), 10, 1)
*/
*/