cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 18:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Couple of fixes for situations involving mechas and the clock cult gamemode (#37218)

Browse Source 
* couple of mech fixes

* safety

* gateway, gravity gen

* Restores oingo-boingo punch-nuke
This commit is contained in:
vuonojenmustaturska
2018-04-18 17:32:35 +03:00
committed by AnturK
parent 8fa8436f54
commit 0e2ee4f5b6
7 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/atoms_movable.dm
View File

@@ -415,6 +415,9 @@
step(src, AM.dir)
..()
/atom/movable/proc/safe_throw_at(atom/target, range, speed, mob/thrower, spin=TRUE, diagonals_first = FALSE, var/datum/callback/callback)
return throw_at(target, range, speed, thrower, spin, diagonals_first, callback)
/atom/movable/proc/throw_at(atom/target, range, speed, mob/thrower, spin=TRUE, diagonals_first = FALSE, var/datum/callback/callback) //If this returns FALSE then callback will not be called.
. = FALSE
if (!target || (flags_1 & NODROP_1) || speed <= 0)

3
code/game/mecha/equipment/weapons/weapons.dm
View File

@@ -428,6 +428,5 @@
if(!..())
if(ismovableatom(hit_atom))
var/atom/movable/AM = hit_atom
AM.throw_at(get_edge_target_turf(AM,get_dir(src, AM)), 7, 2)
AM.safe_throw_at(get_edge_target_turf(AM,get_dir(src, AM)), 7, 2)
qdel(src)

8
code/modules/antagonists/clockcult/clock_effects/city_of_cogs_rift.dm
View File

@@ -54,8 +54,14 @@
/obj/effect/clockwork/city_of_cogs_rift/proc/beckon(atom/movable/AM)
var/turf/T = get_turf(pick(GLOB.city_of_cogs_spawns))
if(is_servant_of_ratvar(AM))
if(ismob(AM) && is_servant_of_ratvar(AM))
T = GLOB.ark_of_the_clockwork_justiciar ? get_step(GLOB.ark_of_the_clockwork_justiciar, SOUTH) : get_turf(pick(GLOB.servant_spawns))
else // Handle mechas and such
var/list/target_contents = AM.GetAllContents() + AM
for(var/mob/living/L in target_contents)
if(is_servant_of_ratvar(L) && L.stat != DEAD) // Having a living cultist in your inventory sends you to the cultist spawn
T = GLOB.ark_of_the_clockwork_justiciar ? get_step(GLOB.ark_of_the_clockwork_justiciar, SOUTH) : get_turf(pick(GLOB.servant_spawns))
break
AM.visible_message("<span class='danger'>[AM] passes through [src]!</span>", null, null, null, AM)
AM.forceMove(T)
AM.visible_message("<span class='danger'>[AM] materializes from the air!</span>", \

3
code/modules/antagonists/clockcult/clock_effects/servant_blocker.dm
View File

@@ -42,3 +42,6 @@
/obj/effect/clockwork/servant_blocker/ex_act(severity, target)
return
/obj/effect/clockwork/servant_blocker/safe_throw_at()
return

3
code/modules/awaymissions/gateway.dm
View File

@@ -74,6 +74,9 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
/obj/machinery/gateway/proc/toggleon(mob/user)
return FALSE
/obj/machinery/gateway/safe_throw_at()
return
/obj/machinery/gateway/centerstation/Initialize()
. = ..()
if(!GLOB.the_gateway)

2
code/modules/power/gravitygenerator.dm
View File

@@ -28,7 +28,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
var/sprite_number = 0
/obj/machinery/gravity_generator/throw_at()
/obj/machinery/gravity_generator/safe_throw_at()
return FALSE
/obj/machinery/gravity_generator/ex_act(severity, target)

2
code/modules/projectiles/projectile/bullets/shotgun.dm
View File

@@ -42,7 +42,7 @@
if(ismovableatom(target))
var/atom/movable/M = target
var/atom/throw_target = get_edge_target_turf(M, get_dir(src, get_step_away(M, src)))
M.throw_at(throw_target, 3, 2)
M.safe_throw_at(throw_target, 3, 2)
/obj/item/projectile/bullet/shotgun_meteorslug/Initialize()
. = ..()