cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Refactors most spans into span procs (#6315)

Browse Source 
* Refactors most spans into span procs

* AA

* a

* AAAAAAAAAAAAAAAAAAAAAA

* Update species.dm

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-06-16 00:24:49 +01:00
committed by GitHub
co-authored by Watermelon914 Gandalf
parent cd5dba4fbd
commit 7d1d0e1fad
1676 changed files with 15455 additions and 15211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/table_frames.dm
+9 -9
View File
@@ -23,7 +23,7 @@
/obj/structure/table_frame/wrench_act(mob/living/user, obj/item/I)
to_chat(user, "<span class='notice'>You start disassembling [src]...</span>")
to_chat(user, span_notice("You start disassembling [src]..."))
I.play_tool_sound(src)
if(!I.use_tool(src, user, 3 SECONDS))
return TRUE
@@ -37,23 +37,23 @@
var/obj/item/stack/material = I
if(material.tableVariant)
if(material.get_amount() < 1)
to_chat(user, "<span class='warning'>You need one [material.name] sheet to do this!</span>")
to_chat(user, span_warning("You need one [material.name] sheet to do this!"))
return
if(locate(/obj/structure/table) in loc)
to_chat(user, "<span class='warning'>There's already a table built here!</span>")
to_chat(user, span_warning("There's already a table built here!"))
return
to_chat(user, "<span class='notice'>You start adding [material] to [src]...</span>")
to_chat(user, span_notice("You start adding [material] to [src]..."))
if(!do_after(user, 2 SECONDS, target = src) || !material.use(1) || (locate(/obj/structure/table) in loc))
return
make_new_table(material.tableVariant)
else if(istype(material, /obj/item/stack/sheet))
if(material.get_amount() < 1)
to_chat(user, "<span class='warning'>You need one sheet to do this!</span>")
to_chat(user, span_warning("You need one sheet to do this!"))
return
if(locate(/obj/structure/table) in loc)
to_chat(user, "<span class='warning'>There's already a table built here!</span>")
to_chat(user, span_warning("There's already a table built here!"))
return
to_chat(user, "<span class='notice'>You start adding [material] to [src]...</span>")
to_chat(user, span_notice("You start adding [material] to [src]..."))
if(!do_after(user, 2 SECONDS, target = src) || !material.use(1) || (locate(/obj/structure/table) in loc))
return
var/list/material_list = list()
@@ -107,9 +107,9 @@
carpet_type = I.type
if (toConstruct)
if(material.get_amount() < 1)
to_chat(user, "<span class='warning'>You need one [material.name] sheet to do this!</span>")
to_chat(user, span_warning("You need one [material.name] sheet to do this!"))
return
to_chat(user, "<span class='notice'>You start adding [material] to [src]...</span>")
to_chat(user, span_notice("You start adding [material] to [src]..."))
if(do_after(user, 20, target = src) && material.use(1))
make_new_table(toConstruct, null, carpet_type)
else