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

Merge pull request #5060 from Citadel-Station-13/upstream-merge-34819

Browse Source 
[MIRROR] Makes photocopier use default_unfasten_wrench
This commit is contained in:
LetterJay
2018-01-24 13:53:48 -06:00
committed by GitHub
parent eda5ac3b5d b58694ca54
commit 1e2f180f16
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/photocopier.dm
+4 -12
View File
@@ -254,7 +254,10 @@
to_chat(user, "<span class='notice'>You take [O] out of [src].</span>") to_chat(user, "<span class='notice'>You take [O] out of [src].</span>")
/obj/machinery/photocopier/attackby(obj/item/O, mob/user, params) /obj/machinery/photocopier/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/paper)) if(default_unfasten_wrench(user, O))
return
else if(istype(O, /obj/item/paper))
if(copier_empty()) if(copier_empty())
if(istype(O, /obj/item/paper/contract/infernal)) if(istype(O, /obj/item/paper/contract/infernal))
to_chat(user, "<span class='warning'>[src] smokes, smelling of brimstone!</span>") to_chat(user, "<span class='warning'>[src] smokes, smelling of brimstone!</span>")
@@ -297,17 +300,6 @@
else else
to_chat(user, "<span class='warning'>This cartridge is not yet ready for replacement! Use up the rest of the toner.</span>") to_chat(user, "<span class='warning'>This cartridge is not yet ready for replacement! Use up the rest of the toner.</span>")
else if(istype(O, /obj/item/wrench))
if(isinspace())
to_chat(user, "<span class='warning'>There's nothing to fasten [src] to!</span>")
return
playsound(loc, O.usesound, 50, 1)
to_chat(user, "<span class='warning'>You start [anchored ? "unwrenching" : "wrenching"] [src]...</span>")
if(do_after(user, 20*O.toolspeed, target = src))
if(QDELETED(src))
return
to_chat(user, "<span class='notice'>You [anchored ? "unwrench" : "wrench"] [src].</span>")
anchored = !anchored
else if(istype(O, /obj/item/areaeditor/blueprints)) else if(istype(O, /obj/item/areaeditor/blueprints))
to_chat(user, "<span class='warning'>The Blueprint is too large to put into the copier. You need to find something else to record the document</span>") to_chat(user, "<span class='warning'>The Blueprint is too large to put into the copier. You need to find something else to record the document</span>")
else else