cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 04:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix all of the merge conflicts and lacking to_chats with 4041

Browse Source
This commit is contained in:
Tigercat2000
2016-04-05 21:16:52 -07:00
parent dd79aaa967
commit 797740da7d
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/buttons.dm
+1 -1
View File
@@ -67,7 +67,7 @@
if(istype(W, /obj/item/weapon/wrench))
playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user, 30, target = src))
user << "<span class='notice'>You detach \the [src] from the wall.</span>"
to_chat(user, "<span class='notice'>You detach \the [src] from the wall.</span>")
new/obj/item/mounted/frame/driver_button(get_turf(src))
qdel(src)
return 1
code/game/machinery/constructable_frame.dm
+1 -1
View File
@@ -924,4 +924,4 @@ obj/item/weapon/circuitboard/rdserver
build_path = typepath
name = "circuit board ([new_name])"
if(user)
user << "<span class='notice'>You set the board to [new_name].</span>"
to_chat(user, "<span class='notice'>You set the board to [new_name].</span>")
code/game/machinery/lightswitch.dm
+1 -1
View File
@@ -151,7 +151,7 @@
if(istype(W, /obj/item/weapon/wrench))
playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user, 30, target = src))
user << "<span class='notice'>You detach \the [src] from the wall.</span>"
to_chat(user, "<span class='notice'>You detach \the [src] from the wall.</span>")
new/obj/item/mounted/frame/light_switch(get_turf(src))
qdel(src)
return 1