shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"

Browse Source 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
This commit is contained in:
SandPoot
2021-02-18 15:04:46 -03:00
parent 2e29f30fdf
commit f738023097
223 changed files with 741 additions and 1462 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/station_goals/bsa.dm
+15 -12
View File
@@ -41,8 +41,9 @@
icon_state = "power_box"
/obj/machinery/bsa/back/multitool_act(mob/living/user, obj/item/I)
if(I.tool_behaviour == TOOL_MULTITOOL) // Lies and deception
I.buffer = src
if(istype(I, /obj/item/multitool)) // Only this multitool type has a data buffer.
var/obj/item/multitool/M = I
M.buffer = src
to_chat(user, "<span class='notice'>You store linkage information in [I]'s buffer.</span>")
else
to_chat(user, "<span class='warning'>[I] has no data buffer!</span>")
@@ -54,8 +55,9 @@
icon_state = "emitter_center"
/obj/machinery/bsa/front/multitool_act(mob/living/user, obj/item/I)
if(I.tool_behaviour == TOOL_MULTITOOL) // Lies and deception
I.buffer = src
if(istype(I, /obj/item/multitool)) // Only this multitool type has a data buffer.
var/obj/item/multitool/M = I
M.buffer = src
to_chat(user, "<span class='notice'>You store linkage information in [I]'s buffer.</span>")
else
to_chat(user, "<span class='warning'>[I] has no data buffer!</span>")
@@ -69,15 +71,16 @@
var/obj/machinery/bsa/front/front
/obj/machinery/bsa/middle/multitool_act(mob/living/user, obj/item/I)
if(I.tool_behaviour == TOOL_MULTITOOL) // Lies and deception
if(I.buffer)
if(istype(I.buffer, /obj/machinery/bsa/back))
back = I.buffer
I.buffer = null
if(istype(I, /obj/item/multitool)) // Only this multitool type has a data buffer.
var/obj/item/multitool/M = I
if(M.buffer)
if(istype(M.buffer, /obj/machinery/bsa/back))
back = M.buffer
M.buffer = null
to_chat(user, "<span class='notice'>You link [src] with [back].</span>")
else if(istype(I.buffer, /obj/machinery/bsa/front))
front = I.buffer
I.buffer = null
else if(istype(M.buffer, /obj/machinery/bsa/front))
front = M.buffer
M.buffer = null
to_chat(user, "<span class='notice'>You link [src] with [front].</span>")
else
to_chat(user, "<span class='warning'>[I]'s data buffer is empty!</span>")
code/modules/station_goals/shield.dm
+1 -1
View File
@@ -122,7 +122,7 @@
icon_state = active ? "sat_active" : "sat_inactive"
/obj/machinery/satellite/attackby(obj/item/I, mob/user, params)
if(I.tool_behaviour == TOOL_MULTITOOL)
if(istype(I, /obj/item/multitool))
to_chat(user, "<span class='notice'>// NTSAT-[id] // Mode : [active ? "PRIMARY" : "STANDBY"] //[(obj_flags & EMAGGED) ? "DEBUG_MODE //" : ""]</span>")
else
return ..()