cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-07-20 12:12:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move chasm type check

Browse Source 
Moves functionality of checking chasm type to Tether, to allow different tethers to protect against different types of chasms, or possibly a list of chasms in future. Also changes the internal radio to possibly save (miniscule) amounts of resources.
This commit is contained in:
Haha26315
2022-09-13 09:22:15 -04:00
parent bfe6f6c623
commit ac1ade6032
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/chasm.dm
+4 -4
View File
@@ -131,8 +131,8 @@
else if(prob(5))
playsound(AM, pick('hyperstation/sound/misc/yodadeath.ogg', 'hyperstation/sound/misc/fallingthroughclouds.ogg', 'hyperstation/sound/misc/goofy.ogg', 'hyperstation/sound/misc/wilhelm.ogg'), 100, 0)
if(linked_turf.name == "clouds" && (iscyborg(AM) || iscarbon(AM)))
//Mob types that could be protected by a tether
if(iscyborg(AM) || iscarbon(AM))
var/mob/living/victim = AM
var/tether_number = GLOB.safety_tethers_list.len
@@ -142,12 +142,12 @@
if(tether_number == 1)
// If teleportation fails
if(!GLOB.safety_tethers_list[1].bungee_teleport(victim))
if(!GLOB.safety_tethers_list[1].bungee_teleport(victim, linked_turf))
finishdrop(AM)
else
//Just in case multiple safety tethers are present
if(!GLOB.safety_tethers_list[rand(1,GLOB.safety_tethers_list.len)].bungee_teleport(victim))
if(!GLOB.safety_tethers_list[rand(1,GLOB.safety_tethers_list.len)].bungee_teleport(victim, linked_turf))
finishdrop(AM)
if(isliving(AM))
var/mob/living/L = AM