diff --git a/code/game/objects/explosion_recursive.dm b/code/game/objects/explosion_recursive.dm index 4668b8bda49..d5aea573bc4 100644 --- a/code/game/objects/explosion_recursive.dm +++ b/code/game/objects/explosion_recursive.dm @@ -1,8 +1,7 @@ -/* - uncomment this to test it out! -/mob/verb/kaboom() +/client/proc/kaboom() var/power = input(src, "power?", "power?") as num - var/turf/T = get_turf(src) - explosion_rec(T, power) */ + var/turf/T = get_turf(src.mob) + explosion_rec(T, power) /obj var/explosion_resistance diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index 1abc8d9c56e..37834111641 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -142,6 +142,8 @@ var/intercom_range_display_status = 0 src.verbs += /client/proc/startSinglo src.verbs += /client/proc/ticklag //allows you to set the ticklag. src.verbs += /client/proc/cmd_admin_grantfullaccess + src.verbs += /client/proc/kaboom + src.verbs += /client/proc/splash //src.verbs += /client/proc/cmd_admin_rejuvenate feedback_add_details("admin_verb","mDV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/liquid/splash_simulation.dm b/code/modules/liquid/splash_simulation.dm index 7453deac758..d7352ff7128 100644 --- a/code/modules/liquid/splash_simulation.dm +++ b/code/modules/liquid/splash_simulation.dm @@ -28,11 +28,11 @@ datum/puddle/Del() del(O) ..() -mob/verb/splash() +client/proc/splash() var/volume = input("Volume?","Volume?", 0 ) as num if(!isnum(volume)) return if(volume <= LIQUID_TRANSFER_THRESHOLD) return - var/turf/T = get_turf(src) + var/turf/T = get_turf(src.mob) if(!isturf(T)) return trigger_splash(T, volume) diff --git a/tgstation.dme b/tgstation.dme index 57e014d2a49..a3563d9ed25 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -111,6 +111,7 @@ #define FILE_DIR "code/modules/flufftext" #define FILE_DIR "code/modules/food" #define FILE_DIR "code/modules/library" +#define FILE_DIR "code/modules/liquid" #define FILE_DIR "code/modules/maps" #define FILE_DIR "code/modules/mining" #define FILE_DIR "code/modules/mob" @@ -203,6 +204,7 @@ #define FILE_DIR "icons/vending_icons" #define FILE_DIR "interface" #define FILE_DIR "maps" +#define FILE_DIR "maps/backup" #define FILE_DIR "maps/RandomZLevels" #define FILE_DIR "sound" #define FILE_DIR "sound/AI" @@ -891,6 +893,7 @@ #include "code\modules\library\lib_items.dm" #include "code\modules\library\lib_machines.dm" #include "code\modules\library\lib_readme.dm" +#include "code\modules\liquid\splash_simulation.dm" #include "code\modules\maps\dmm_suite.dm" #include "code\modules\maps\randomZlevel.dm" #include "code\modules\maps\reader.dm"