cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 01:49:19 +00:00
Code Issues 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

2
code/datums/components/riding.dm
View File

@@ -341,7 +341,7 @@
var/mob/living/parent
var/selfdeleting = FALSE
/obj/item/riding_offhand/dropped()
/obj/item/riding_offhand/dropped(mob/user)
selfdeleting = TRUE
. = ..()

2
code/datums/elements/mob_holder.dm
View File

@@ -138,7 +138,7 @@
destination = get_turf(loc)
AM.forceMove(destination)
/obj/item/clothing/head/mob_holder/dropped()
/obj/item/clothing/head/mob_holder/dropped(mob/user)
. = ..()
if(held_mob && isturf(loc))//don't release on soft-drops
release()

4
code/game/machinery/pipe/construction.dm
View File

@@ -63,7 +63,7 @@ Buildable meters
if(make_from.flipped)
do_a_flip()
/obj/item/pipe/dropped()
/obj/item/pipe/dropped(mob/user)
if(loc)
setPipingLayer(piping_layer)
return ..()
@@ -225,7 +225,7 @@ Buildable meters
to_chat(user, "<span class='notice'>You fasten the meter to the [loc.name].</span>")
qdel(src)
/obj/item/pipe_meter/dropped()
/obj/item/pipe_meter/dropped(mob/user)
. = ..()
if(loc)
setAttachLayer(piping_layer)

6
code/game/objects/items/chrono_eraser.dm
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

2
code/game/objects/items/devices/chameleonproj.dm
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()

2
code/game/objects/items/devices/geiger_counter.dm
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)

4
code/game/objects/items/devices/scanners.dm
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))

4
code/game/objects/items/devices/transfer_valve.dm
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)

4
code/game/objects/items/granters.dm
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

4
code/game/objects/items/robot/robot_items.dm
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

2
code/game/objects/items/storage/bags.dm
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)

9
code/game/objects/objs.dm
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

4
code/modules/assembly/bomb.dm
View File

@@ -101,10 +101,10 @@
bombassembly.setDir(dir)
bombassembly.Move()
/obj/item/onetankbomb/dropped()
/obj/item/onetankbomb/dropped(mob/user)
. = ..()
if(bombassembly)
bombassembly.dropped()
bombassembly.dropped(user)

4
code/modules/assembly/holder.dm
View File

@@ -83,9 +83,9 @@
/obj/item/assembly_holder/dropped(mob/user)
. = ..()
if(a_left)
a_left.dropped()
a_left.dropped(user)
if(a_right)
a_right.dropped()
a_right.dropped(user)
/obj/item/assembly_holder/attack_hand()//Perhapse this should be a holder_pickup proc instead, can add if needbe I guess
. = ..()

2
code/modules/assembly/infrared.dm
View File

@@ -74,7 +74,7 @@
holder.update_icon()
return
/obj/item/assembly/infra/dropped()
/obj/item/assembly/infra/dropped(mob/user)
. = ..()
if(holder)
holder_movement() //sync the dir of the device as well if it's contained in a TTV or an assembly holder

8
code/modules/awaymissions/capture_the_flag.dm
View File

@@ -379,7 +379,7 @@
force = 75
mag_type = /obj/item/ammo_box/magazine/m50/ctf
/obj/item/gun/ballistic/automatic/pistol/deagle/ctf/dropped()
/obj/item/gun/ballistic/automatic/pistol/deagle/ctf/dropped(mob/user)
. = ..()
addtimer(CALLBACK(GLOBAL_PROC, /proc/ctf_floor_vanish, src), 1)
@@ -402,14 +402,14 @@
desc = "This looks like it could really hurt in melee."
force = 50
/obj/item/gun/ballistic/automatic/laser/ctf/dropped()
/obj/item/gun/ballistic/automatic/laser/ctf/dropped(mob/user)
. = ..()
addtimer(CALLBACK(GLOBAL_PROC, /proc/ctf_floor_vanish, src), 1)
/obj/item/ammo_box/magazine/recharge/ctf
ammo_type = /obj/item/ammo_casing/caseless/laser/ctf
/obj/item/ammo_box/magazine/recharge/ctf/dropped()
/obj/item/ammo_box/magazine/recharge/ctf/dropped(mob/user)
. = ..()
addtimer(CALLBACK(GLOBAL_PROC, /proc/ctf_floor_vanish, src), 1)
@@ -475,7 +475,7 @@
return TRUE
return ..()
/obj/item/claymore/ctf/dropped()
/obj/item/claymore/ctf/dropped(mob/user)
. = ..()
addtimer(CALLBACK(GLOBAL_PROC, /proc/ctf_floor_vanish, src), 1)

8
code/modules/clothing/head/soft_caps.dm
View File

@@ -9,10 +9,10 @@
var/flipped = 0
/obj/item/clothing/head/soft/dropped()
src.icon_state = "[item_color]soft"
src.flipped=0
..()
/obj/item/clothing/head/soft/dropped(mob/user)
icon_state = "[item_color]soft"
flipped = FALSE
return ..()
/obj/item/clothing/head/soft/verb/flipcap()
set category = "Object"

13
code/modules/clothing/spacesuits/chronosuit.dm
View File

@@ -8,16 +8,11 @@
resistance_flags = FIRE_PROOF | ACID_PROOF
var/obj/item/clothing/suit/space/chronos/suit = null
/obj/item/clothing/head/helmet/space/chronos/dropped()
/obj/item/clothing/head/helmet/space/chronos/dropped(mob/user)
if(suit)
suit.deactivate(1, 1)
..()
/obj/item/clothing/head/helmet/space/chronos/Destroy()
dropped()
return ..()
/obj/item/clothing/suit/space/chronos
name = "Chronosuit"
desc = "An advanced spacesuit equipped with time-bluespace teleportation and anti-compression technology."
@@ -57,15 +52,11 @@
else
deactivate()
/obj/item/clothing/suit/space/chronos/dropped()
/obj/item/clothing/suit/space/chronos/dropped(mob/user)
if(activated)
deactivate()
..()
/obj/item/clothing/suit/space/chronos/Destroy()
dropped()
return ..()
/obj/item/clothing/suit/space/chronos/emp_act(severity)
. = ..()
if(. & EMP_PROTECT_SELF)

5
code/modules/clothing/spacesuits/flightsuit.dm
View File

@@ -805,7 +805,8 @@
. += "<span class='boldnotice'>Its maintainence panel is [maint_panel ? "OPEN" : "CLOSED"]</span>"
/obj/item/clothing/suit/space/hardsuit/flightsuit/Destroy()
dropped()
if(ismob(loc))
dropped(loc)
QDEL_NULL(pack)
QDEL_NULL(shoes)
return ..()
@@ -834,7 +835,7 @@
return FALSE
return ..()
/obj/item/clothing/suit/space/hardsuit/flightsuit/dropped()
/obj/item/clothing/suit/space/hardsuit/flightsuit/dropped(mob/the_user)
if(deployedpack)
retract_flightpack(TRUE)
if(deployedshoes)

2
code/modules/clothing/spacesuits/hardsuit.dm
View File

@@ -705,7 +705,7 @@
RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/on_mob_move)
listeningTo = user
/obj/item/clothing/suit/space/hardsuit/ancient/dropped()
/obj/item/clothing/suit/space/hardsuit/ancient/dropped(mob/user)
. = ..()
if(listeningTo)
UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED)

6
code/modules/clothing/suits/toggles.dm
View File

@@ -45,7 +45,7 @@
var/datum/action/A = X
A.UpdateButtonIcon()
/obj/item/clothing/suit/hooded/dropped()
/obj/item/clothing/suit/hooded/dropped(mob/user)
..()
RemoveHood()
@@ -76,7 +76,7 @@
suit = null
return ..()
/obj/item/clothing/head/hooded/dropped()
/obj/item/clothing/head/hooded/dropped(mob/user)
..()
if(suit)
suit.RemoveHood()
@@ -174,7 +174,7 @@
else
helmet.forceMove(src)
/obj/item/clothing/suit/space/hardsuit/dropped()
/obj/item/clothing/suit/space/hardsuit/dropped(mob/user)
..()
RemoveHelmet()

2
code/modules/fields/fields.dm
View File

@@ -312,7 +312,7 @@
else if(!operating)
QDEL_NULL(current)
/obj/item/multitool/field_debug/dropped()
/obj/item/multitool/field_debug/dropped(mob/user)
. = ..()
if(listeningTo)
UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED)

2
code/modules/hydroponics/grown/banana.dm
View File

@@ -151,7 +151,7 @@
spawn(30)
if(!QDELETED(src))
var/mob/living/simple_animal/banana_spider/S = new /mob/living/simple_animal/banana_spider(get_turf(src.loc))
S.speed += round(10 / seed.potency)
S.speed += round(10 - 10 * (seed.potency/100), 1)
S.visible_message("<span class='notice'>The banana spider chitters as it stretches its legs.</span>")
qdel(src)

4
code/modules/mob/living/carbon/inventory.dm
View File

@@ -122,9 +122,9 @@
update_inv_wear_mask()
/mob/living/carbon/wear_mask_update(obj/item/clothing/C, toggle_off = 1)
if(C.tint || initial(C.tint))
if(isclothing(C) && (C.tint || initial(C.tint)))
update_tint()
update_inv_wear_mask()
return ..()
//handle stuff to update when a mob equips/unequips a headgear.
/mob/living/carbon/proc/head_update(obj/item/I, forced)

1
code/modules/projectiles/guns/ballistic/automatic.dm
View File

@@ -39,7 +39,6 @@
magazine = AM
if(oldmag)
to_chat(user, "<span class='notice'>You perform a tactical reload on \the [src], replacing the magazine.</span>")
oldmag.dropped()
oldmag.forceMove(get_turf(src.loc))
oldmag.update_icon()
else

2
code/modules/projectiles/guns/ballistic/shotgun.dm
View File

@@ -171,7 +171,7 @@
pump()
gun_type = type
/obj/item/gun/ballistic/shotgun/boltaction/enchanted/dropped()
/obj/item/gun/ballistic/shotgun/boltaction/enchanted/dropped(mob/user)
..()
guns_left = 0

4
code/modules/projectiles/guns/energy/kinetic_accelerator.dm
View File

@@ -34,7 +34,7 @@
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
ammo_type = list(/obj/item/ammo_casing/energy/kinetic/premium)
/obj/item/gun/energy/kinetic_accelerator/premiumka/dropped()
/obj/item/gun/energy/kinetic_accelerator/premiumka/dropped(mob/user)
. = ..()
if(!QDELING(src) && !holds_charge)
// Put it on a delay because moving item from slot to hand
@@ -137,7 +137,7 @@
if(!can_shoot())
attempt_reload()
/obj/item/gun/energy/kinetic_accelerator/dropped()
/obj/item/gun/energy/kinetic_accelerator/dropped(mob/user)
. = ..()
if(!QDELING(src) && !holds_charge)
// Put it on a delay because moving item from slot to hand