cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +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/modules/logic/converter.dm
+4 -4
View File
@@ -32,10 +32,10 @@
if(istype(O, /obj/item/device/assembly/signaler))
var/obj/item/device/assembly/signaler/S = O
if(S.secured)
user << "<span class='warning'>The [S] is already secured.</span>"
to_chat(user, "<span class='warning'>The [S] is already secured.</span>")
return
if(attached_signaler)
user << "<span class='warning'>There is already a device attached, remove it first.</span>"
to_chat(user, "<span class='warning'>There is already a device attached, remove it first.</span>")
return
user.unEquip(S)
S.forceMove(src)
@@ -46,7 +46,7 @@
else
S.receiving = 0
attached_signaler = S
user << "<span class='notice'>You attach \the [S] to the I/O connection port and secure it.</span>"
to_chat(user, "<span class='notice'>You attach \the [S] to the I/O connection port and secure it.</span>")
return
if(attached_signaler && istype(O, /obj/item/weapon/screwdriver)) //Makes sure we remove the attached signaler before we can open up and deconstruct the machine
var/obj/item/device/assembly/signaler/S = attached_signaler
@@ -54,7 +54,7 @@
S.forceMove(get_turf(src))
S.holder = null
S.toggle_secure()
user << "<span class='notice'>You unsecure and detach \the [S] from the I/O connection port.</span>"
to_chat(user, "<span class='notice'>You unsecure and detach \the [S] from the I/O connection port.</span>")
return
..()
code/modules/logic/logic_base.dm
+8 -8
View File
@@ -199,14 +199,14 @@
/obj/machinery/logic_gate/attackby(obj/item/O, mob/user, params)
if(tamperproof)
user << "<span class='warning'>The [src] appears to be tamperproofed! You can't interact with it!</span>"
to_chat(user, "<span class='warning'>The [src] appears to be tamperproofed! You can't interact with it!</span>")
return 0
if(istype(O, /obj/item/device/multitool))
update_multitool_menu(user)
return 1
if(istype(O, /obj/item/weapon/screwdriver))
panel_open = !panel_open
user << "<span class='notice'>You [panel_open ? "open" : "close"] the access panel.</span>"
to_chat(user, "<span class='notice'>You [panel_open ? "open" : "close"] the access panel.</span>")
return 1
if(panel_open && istype(O, /obj/item/weapon/crowbar))
default_deconstruction_crowbar(O)
@@ -218,20 +218,20 @@
/obj/machinery/logic_gate/attack_ai(mob/user)
if(tamperproof)
user << "<span class='warning'>The [src] appears to be tamperproofed! You can't interface with it!</span>"
to_chat(user, "<span class='warning'>The [src] appears to be tamperproofed! You can't interface with it!</span>")
return 0
add_hiddenprint(user)
return ui_interact(user)
/obj/machinery/logic_gate/attack_ghost(mob/user)
if(tamperproof)
user << "<span class='warning'>The [src] appears to be tamperproofed! You can't haunt it!</span>"
to_chat(user, "<span class='warning'>The [src] appears to be tamperproofed! You can't haunt it!</span>")
return 0
return ui_interact(user)
/obj/machinery/logic_gate/attack_hand(mob/user)
if(tamperproof)
user << "<span class='warning'>The [src] appears to be tamperproofed! You can't interact with it!</span>"
to_chat(user, "<span class='warning'>The [src] appears to be tamperproofed! You can't interact with it!</span>")
return 0
. = ..()
if(.)
@@ -239,15 +239,15 @@
return interact(user)
/obj/machinery/logic_gate/attack_alien(mob/user) //No xeno logic, that's too silly.
user << "<span class='warning'>The [src] appears to be too complex! You can't comprehend it and back off in fear!</span>"
to_chat(user, "<span class='warning'>The [src] appears to be too complex! You can't comprehend it and back off in fear!</span>")
return 0
/obj/machinery/logic_gate/attack_animal(mob/user) //No animal logic either.
user << "<span class='warning'>The [src] appears to be beyond your comprehension! You can't fathom it!</span>"
to_chat(user, "<span class='warning'>The [src] appears to be beyond your comprehension! You can't fathom it!</span>")
return 0
/obj/machinery/logic_gate/attack_slime(mob/user) //No slime logic. Seriously.
user << "<span class='warning'>The [src] appears to be beyond your gelatinous understanding! You ignore it!</span>"
to_chat(user, "<span class='warning'>The [src] appears to be beyond your gelatinous understanding! You ignore it!</span>")
return 0
/obj/machinery/logic_gate/emp_act(severity)