cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removes a redundant atom-level list

Browse Source 
1 is now the default value taken if the list is null.
Did construction testing, no nasty runtimes occured.
This commit is contained in:
ComicIronic
2015-05-28 16:47:26 +01:00
parent ddd067b4e8
commit d78819314d
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/datums/helper_datums/construction_datum.dm
View File

@@ -133,7 +133,7 @@
return
/datum/construction/proc/try_consume(mob/user as mob, atom/movable/used_atom, given_step)
if(!used_atom.construction_delay_mult[Co_CON_SPEED])
if(used_atom.construction_delay_mult && !used_atom.construction_delay_mult[Co_CON_SPEED])
user << "<span class='warning'>This tool only works for deconstruction!</span>" //It doesn't technically have to be a tool to cause this message, but it wouldn't make sense for anything else to do so.
return 0
@@ -143,7 +143,10 @@
var/delay = 0
if(Co_DELAY in given_step)
delay = given_step[Co_DELAY] * used_atom.construction_delay_mult[Co_CON_SPEED]
if(used_atom.construction_delay_mult)
delay = given_step[Co_DELAY] * used_atom.construction_delay_mult[Co_CON_SPEED]
else
delay = given_step[Co_DELAY]
if(delay > 0)
start_construct_message(given_step, user, used_atom)
if(!do_after(user, delay, needhand = 1))
@@ -289,7 +292,7 @@
/datum/construction/reversible/try_consume(mob/user as mob, atom/movable/used_atom, given_step, index, diff)
//if we've made some progress on a step, we want to drop it
var/current_step = (diff == BACKWARD ? get_forward_step(index) : get_backward_step(index))
if(!used_atom.construction_delay_mult[diff == FORWARD ? Co_CON_SPEED : Co_DECON_SPEED])
if(used_atom.construction_delay_mult && !used_atom.construction_delay_mult[diff == FORWARD ? Co_CON_SPEED : Co_DECON_SPEED])
user << "<span class='warning'>This tool only works for [diff == FORWARD ? "de" : ""]construction!</span>" //It doesn't technically have to be a tool to cause this message, but it wouldn't make sense for anything else to do so.
return 0
if(current_step && (Co_AMOUNT in current_step) && (Co_MAX_AMOUNT in current_step) && (current_step[Co_AMOUNT] < current_step[Co_MAX_AMOUNT]))
@@ -311,7 +314,10 @@
var/delay = 0
if(Co_DELAY in given_step)
delay = given_step[Co_DELAY] * used_atom.construction_delay_mult[diff == FORWARD ? Co_CON_SPEED : Co_DECON_SPEED]
if(used_atom.construction_delay_mult)
delay = given_step[Co_DELAY] * used_atom.construction_delay_mult[diff == FORWARD ? Co_CON_SPEED : Co_DECON_SPEED]
else
delay = given_step[Co_DELAY]
if(delay > 0)
start_construct_message(given_step, user, used_atom)
if(!do_after(user, delay, needhand = 1))