cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 06:00:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues discovered via TypeMaker (#87596)

Browse Source 
## About The Pull Request
Fixes issues with var typing and proc arguments, discovered using
OpenDream's WIP TypeMaker feature (using improvements I haven't PR'd
upstream yet).

## Why It's Good For The Game
Codebase maintenance.
This commit is contained in:
Penelope Haze
2024-11-19 15:24:52 -05:00
committed by GitHub
parent 3c8fa5630f
commit b67a0901f2
93 changed files with 336 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mapfluff/ruins/objects_and_mobs/ash_walker_den.dm
+5 -5
View File
@@ -59,13 +59,13 @@
if(offeredmob.mind?.has_antag_datum(/datum/antagonist/ashwalker) && (offeredmob.ckey || offeredmob.get_ghost(FALSE, TRUE))) //special interactions for dead lava lizards with ghosts attached
visible_message(span_warning("Serrated tendrils carefully pull [offeredmob] to [src], absorbing the body and creating it anew."))
var/datum/mind/deadmind
var/mob/deadmob
if(offeredmob.ckey)
deadmind = offeredmob
deadmob = offeredmob
else
deadmind = offeredmob.get_ghost(FALSE, TRUE)
to_chat(deadmind, "Your body has been returned to the nest. You are being remade anew, and will awaken shortly. </br><b>Your memories will remain intact in your new body, as your soul is being salvaged</b>")
SEND_SOUND(deadmind, sound('sound/effects/magic/enter_blood.ogg',volume=100))
deadmob = offeredmob.get_ghost(FALSE, TRUE)
to_chat(deadmob, "Your body has been returned to the nest. You are being remade anew, and will awaken shortly. </br><b>Your memories will remain intact in your new body, as your soul is being salvaged</b>")
SEND_SOUND(deadmob, sound('sound/effects/magic/enter_blood.ogg',volume=100))
addtimer(CALLBACK(src, PROC_REF(remake_walker), offeredmob), 20 SECONDS)
offeredmob.forceMove(src)
return
code/modules/mapfluff/ruins/spaceruin_code/hauntedtradingpost.dm
+1 -1
View File
@@ -245,7 +245,7 @@
//is this being used as part of the haunted trading post ruin? if true, will self destruct when boss dies
var/donk_ai_slave = FALSE
// machine that the trap inhabits
var/obj/structure/host_machine
var/obj/machinery/host_machine
// turf that the trap is on
var/turf/my_turf
//how long until trap zaps everything, after it detects something