Merge pull request #31340 from Firecage/codeshitnotshit

Does some code standardization/consistency.
This commit is contained in:
Jordan Brown
2017-10-05 15:53:11 -04:00
committed by GitHub
152 changed files with 918 additions and 466 deletions
+2 -1
View File
@@ -43,7 +43,8 @@
usr.set_machine(src)
src.add_fingerprint(usr)
if(href_list["release"])
if(!(text2path(href_list["release"]) in machine.stack_list)) return //someone tried to spawn materials by spoofing hrefs
if(!(text2path(href_list["release"]) in machine.stack_list))
return //someone tried to spawn materials by spoofing hrefs
var/obj/item/stack/sheet/inp = machine.stack_list[text2path(href_list["release"])]
var/obj/item/stack/sheet/out = new inp.type()
out.amount = inp.amount
+2 -1
View File
@@ -434,7 +434,8 @@
overlays = list()
string_attached = null
to_chat(user, "<span class='notice'>You detach the string from the coin.</span>")
else ..()
else
..()
/obj/item/coin/attack_self(mob/user)
if(cooldown < world.time)