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

Fix runtimes some more.

Browse Source
This commit is contained in:
Ghommie
2020-03-10 22:40:06 +01:00
parent 0d66a40e55
commit 27a7f754c4
27 changed files with 49 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/chrono_eraser.dm
+1 -5
View File
@@ -18,15 +18,11 @@
/obj/item/chrono_eraser/proc/pass_mind(datum/mind/M)
erased_minds += M
/obj/item/chrono_eraser/dropped()
/obj/item/chrono_eraser/dropped(mob/user)
..()
if(PA)
qdel(PA)
/obj/item/chrono_eraser/Destroy()
dropped()
return ..()
/obj/item/chrono_eraser/ui_action_click(mob/user)
if(iscarbon(user))
var/mob/living/carbon/C = user
code/game/objects/items/devices/chameleonproj.dm
+1 -1
View File
@@ -21,7 +21,7 @@
var/obj/item/cigbutt/butt = /obj/item/cigbutt
saved_appearance = initial(butt.appearance)
/obj/item/chameleon/dropped()
/obj/item/chameleon/dropped(mob/user)
..()
disrupt()
code/game/objects/items/devices/geiger_counter.dm
+1 -1
View File
@@ -218,7 +218,7 @@
/obj/item/geiger_counter/cyborg/proc/redirect_rad_act(datum/source, amount)
rad_act(amount)
/obj/item/geiger_counter/cyborg/dropped()
/obj/item/geiger_counter/cyborg/dropped(mob/user)
. = ..()
if(listeningTo)
UnregisterSignal(listeningTo, COMSIG_ATOM_RAD_ACT)
code/game/objects/items/devices/scanners.dm
+2 -2
View File
@@ -326,8 +326,8 @@ SLIME SCANNER
breathes = FALSE
if(NOBLOOD in C.dna.species.species_traits)
blooded = FALSE
var/has_liver = (!(NOLIVER in C.dna.species.species_traits))
var/has_stomach = (!(NOSTOMACH in C.dna.species.species_traits))
var/has_liver = C.dna && !(NOLIVER in C.dna.species.species_traits)
var/has_stomach = C.dna && !(NOSTOMACH in C.dna.species.species_traits)
if(!M.getorganslot(ORGAN_SLOT_EYES))
msg += "\t<span class='alert'><b>Subject does not have eyes.</b></span>\n"
if(!M.getorganslot(ORGAN_SLOT_EARS))
code/game/objects/items/devices/transfer_valve.dm
+2 -2
View File
@@ -63,10 +63,10 @@
if(attached_device)
attached_device.holder_movement()
/obj/item/transfer_valve/dropped()
/obj/item/transfer_valve/dropped(mob/user)
. = ..()
if(attached_device)
attached_device.dropped()
attached_device.dropped(user)
/obj/item/transfer_valve/on_found(mob/finder)
if(attached_device)
code/game/objects/items/granters.dm
+2 -2
View File
@@ -11,7 +11,7 @@
/obj/item/book/granter/proc/turn_page(mob/user)
playsound(user, pick('sound/effects/pageturn1.ogg','sound/effects/pageturn2.ogg','sound/effects/pageturn3.ogg'), 30, 1)
if(do_after(user,50, user))
if(do_after(user,50, TRUE, user))
if(remarks.len)
to_chat(user, "<span class='notice'>[pick(remarks)]</span>")
else
@@ -53,7 +53,7 @@
on_reading_stopped()
reading = FALSE
return
if(do_after(user,50, user))
if(do_after(user,50, TRUE, user))
on_reading_finished(user)
reading = FALSE
return TRUE
code/game/objects/items/robot/robot_items.dm
+2 -2
View File
@@ -357,7 +357,7 @@
/obj/item/borg/lollipop/equipped()
check_amount()
/obj/item/borg/lollipop/dropped()
/obj/item/borg/lollipop/dropped(mob/user)
check_amount()
/obj/item/borg/lollipop/proc/check_amount() //Doesn't even use processing ticks.
@@ -620,7 +620,7 @@
return host.loc
return null
/obj/item/borg/projectile_dampen/dropped()
/obj/item/borg/projectile_dampen/dropped(mob/user)
. = ..()
host = loc
code/game/objects/items/storage/bags.dm
+1 -1
View File
@@ -132,7 +132,7 @@
RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/Pickup_ores)
listeningTo = user
/obj/item/storage/bag/ore/dropped()
/obj/item/storage/bag/ore/dropped(mob/user)
. = ..()
if(listeningTo)
UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED)
code/game/objects/objs.dm
+4 -5
View File
@@ -127,11 +127,10 @@
if ((M.client && M.machine == src))
is_in_use = TRUE
ui_interact(M)
if(isAI(usr) || iscyborg(usr) || IsAdminGhost(usr) || hasSiliconAccessInArea(usr))
if (!(usr in nearby))
if (usr.client && usr.machine==src) // && M.machine == src is omitted because if we triggered this by using the dialog, it doesn't matter if our machine changed in between triggering it and this - the dialog is probably still supposed to refresh.
is_in_use = TRUE
ui_interact(usr)
if(usr && hasSiliconAccessInArea(usr) && !(usr in nearby))
if (usr.client && usr.machine==src) // && M.machine == src is omitted because if we triggered this by using the dialog, it doesn't matter if our machine changed in between triggering it and this - the dialog is probably still supposed to refresh.
is_in_use = TRUE
ui_interact(usr)
// check for TK users