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-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

missed files

Browse Source
This commit is contained in:
deathride58
2018-07-05 01:27:07 -04:00
parent 3e18d8208e
commit b2ec8f89e0
4 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
code/controllers/subsystem/throwing.dm
View File

@@ -26,7 +26,7 @@ SUBSYSTEM_DEF(throwing)
var/atom/movable/AM = currentrun[currentrun.len] var/atom/movable/AM = currentrun[currentrun.len]
var/datum/thrownthing/TT = currentrun[AM] var/datum/thrownthing/TT = currentrun[AM]
currentrun.len-- currentrun.len--
if (!AM || !TT) if (QDELETED(AM) || QDELETED(TT))
processing -= AM processing -= AM
if (MC_TICK_CHECK) if (MC_TICK_CHECK)
return return
@@ -61,6 +61,15 @@ SUBSYSTEM_DEF(throwing)
var/delayed_time = 0 var/delayed_time = 0
var/last_move = 0 var/last_move = 0
/datum/thrownthing/Destroy()
SSthrowing.processing -= thrownthing
thrownthing.throwing = null
thrownthing = null
target = null
thrower = null
callback = null
return ..()
/datum/thrownthing/proc/tick() /datum/thrownthing/proc/tick()
var/atom/movable/AM = thrownthing var/atom/movable/AM = thrownthing
if (!isturf(AM.loc) || !AM.throwing) if (!isturf(AM.loc) || !AM.throwing)
@@ -113,15 +122,15 @@ SUBSYSTEM_DEF(throwing)
return return
/datum/thrownthing/proc/finalize(hit = FALSE, target=null) /datum/thrownthing/proc/finalize(hit = FALSE, target=null)
set waitfor = 0 set waitfor = FALSE
SSthrowing.processing -= thrownthing
//done throwing, either because it hit something or it finished moving //done throwing, either because it hit something or it finished moving
thrownthing.throwing = null if(!thrownthing)
return
if (!hit) if (!hit)
for (var/thing in get_turf(thrownthing)) //looking for our target on the turf we land on. for (var/thing in get_turf(thrownthing)) //looking for our target on the turf we land on.
var/atom/A = thing var/atom/A = thing
if (A == target) if (A == target)
hit = 1 hit = TRUE
thrownthing.throw_impact(A, src) thrownthing.throw_impact(A, src)
break break
if (!hit) if (!hit)
@@ -136,6 +145,8 @@ SUBSYSTEM_DEF(throwing)
if (callback) if (callback)
callback.Invoke() callback.Invoke()
qdel(src)
/datum/thrownthing/proc/hit_atom(atom/A) /datum/thrownthing/proc/hit_atom(atom/A)
finalize(hit=TRUE, target=A) finalize(hit=TRUE, target=A)

5
code/game/atoms.dm
View File

@@ -532,6 +532,11 @@
/atom/Entered(atom/movable/AM, atom/oldLoc) /atom/Entered(atom/movable/AM, atom/oldLoc)
SEND_SIGNAL(src, COMSIG_ATOM_ENTERED, AM, oldLoc) SEND_SIGNAL(src, COMSIG_ATOM_ENTERED, AM, oldLoc)
/atom/Exit(atom/movable/AM, atom/newLoc)
. = ..()
if(SEND_SIGNAL(src, COMSIG_ATOM_EXIT, AM, newLoc) & COMPONENT_ATOM_BLOCK_EXIT)
return FALSE
/atom/Exited(atom/movable/AM, atom/newLoc) /atom/Exited(atom/movable/AM, atom/newLoc)
SEND_SIGNAL(src, COMSIG_ATOM_EXITED, AM, newLoc) SEND_SIGNAL(src, COMSIG_ATOM_EXITED, AM, newLoc)

2
code/game/machinery/computer/apc_control.dm
View File

@@ -137,7 +137,7 @@
active_apc = APC active_apc = APC
if(href_list["name_filter"]) if(href_list["name_filter"])
playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
var/new_filter = stripped_input(usr, "What name are you looking for?", name) as null|text var/new_filter = stripped_input(usr, "What name are you looking for?", name)
if(!src || !usr || !usr.canUseTopic(src) || stat || QDELETED(src)) if(!src || !usr || !usr.canUseTopic(src) || stat || QDELETED(src))
return return
log_activity("changed name filter to \"[new_filter]\"") log_activity("changed name filter to \"[new_filter]\"")

2
code/game/machinery/computer/launchpad_control.dm
View File

@@ -128,7 +128,7 @@
pad.x_offset = 0 pad.x_offset = 0
if(href_list["change_name"]) if(href_list["change_name"])
var/new_name = stripped_input(usr, "What do you wish to name the launchpad?", "Launchpad", pad.display_name, 15) as text|null var/new_name = stripped_input(usr, "What do you wish to name the launchpad?", "Launchpad", pad.display_name, 15)
if(!new_name) if(!new_name)
return return
pad.display_name = new_name pad.display_name = new_name