mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 18:32:03 +00:00
fixes
-speakers and vending machines can talk again -library computer can be emagged again -ghosts can no longer use the magnets control computer in sec -weird typo in the code removed, this has the possibility of fixing some bugs or not idk
This commit is contained in:
@@ -244,7 +244,7 @@ var/shuttle_call/shuttle_calls[0]
|
||||
|
||||
return 1
|
||||
|
||||
/obj/machinery/computer/communcations/emag(mob/user as mob)
|
||||
/obj/machinery/computer/communications/emag(mob/user as mob)
|
||||
src.emagged = 1
|
||||
user << "You scramble the communication routing circuits!"
|
||||
|
||||
|
||||
@@ -278,6 +278,10 @@
|
||||
onclose(user, "magnet")
|
||||
|
||||
Topic(href, href_list)
|
||||
if(..())
|
||||
return
|
||||
if(usr.stat || ( !in_range(src, usr) || istype(usr, /mob/living/silicon) ) )
|
||||
return
|
||||
if(stat & (BROKEN|NOPOWER))
|
||||
return
|
||||
usr.set_machine(src)
|
||||
|
||||
@@ -67,6 +67,7 @@
|
||||
var/list/overlays_vending[2]//1 is the panel layer, 2 is the dangermode layer
|
||||
|
||||
machine_flags = SCREWTOGGLE | WRENCHMOVE | FIXED2WORK | CROWDESTROY
|
||||
languages = HUMAN
|
||||
|
||||
var/obj/machinery/account_database/linked_db
|
||||
var/datum/money_account/linked_account
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
w_type = RECYK_ELECTRONIC
|
||||
origin_tech = "magnets=1"
|
||||
|
||||
languages = HUMAN
|
||||
|
||||
var/message = "Thank you for using NanoSpeaker!"
|
||||
|
||||
/obj/item/device/assembly/speaker/activate()
|
||||
var/tmp/location = get_turf(src)
|
||||
for(var/mob/O in hearers(location, null))
|
||||
O.show_message("<span class='game say'><span class='name'>[src]</span> beeps, \"[message]\"",2)
|
||||
src.say(message)
|
||||
|
||||
/obj/item/device/assembly/speaker/attack_self(mob/user as mob)
|
||||
message = sanitize(input(user,"Enter new message for the [src]","NanoSpeaker Settings",message))
|
||||
@@ -29,6 +29,8 @@
|
||||
else
|
||||
name = real_name
|
||||
|
||||
/obj/item/device/assembly/speaker/can_speak()
|
||||
return 1
|
||||
/*
|
||||
/obj/item/device/assembly/speaker/proc/say(var/msg=message as text)
|
||||
var/tmp/location = get_turf(src)
|
||||
|
||||
@@ -197,6 +197,8 @@ var/libcomp_menu
|
||||
var/bibledelay = 0 // LOL NO SPAM (1 minute delay) -- Doohl
|
||||
var/booklist
|
||||
|
||||
machine_flags = EMAGGABLE
|
||||
|
||||
/obj/machinery/librarycomp/New()
|
||||
library_computers += src
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user