cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove safety bit, unneeded, remove lying check, also unneeded.

Browse Source 
Relocate macro/micro bump to _vr
This commit is contained in:
Rykka
2020-08-05 21:00:40 -04:00
parent d07746d84e
commit 992d204432
3 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
code/modules/mob/living/bot/mulebot.dm
View File

@@ -218,12 +218,6 @@
/mob/living/bot/mulebot/confirmTarget()
return 1
/mob/living/bot/mulebot/handle_micro_bump_helping() // VOREStation EDIT: Can't drive over micros or macros regardless of intent.
return 0
/mob/living/bot/mulebot/handle_micro_bump_other() // VOREStation EDIT: Can't drive over micros or macros regardless of intent.
return 0
/mob/living/bot/mulebot/calcTargetPath()
..()
if(!target_path.len && target != home) // I presume that target is not null
@@ -248,7 +242,7 @@
..()
/mob/living/bot/mulebot/proc/runOver(var/mob/living/M)
if(istype(M) && M.lying) // Screw the original implementation, of "runs over everything, no checks". We're going to check if you're lying down.
if(istype(M)) // At this point, MULEBot has somehow crossed over onto your tile with you still on it. CRRRNCH.
visible_message("<span class='warning'>[src] drives over [M]!</span>")
playsound(src, 'sound/effects/splat.ogg', 50, 1)
@@ -260,20 +254,6 @@
M.apply_damage(0.5 * damage, BRUTE, BP_L_ARM)
M.apply_damage(0.5 * damage, BRUTE, BP_R_ARM)
blood_splatter(src, M, 1)
else if(istype(M) && !safety) // Are safeties disabled? Gonna FUCK you up.
visible_message("<span class='warning'>[src] drives over [M]!</span>")
playsound(src, 'sound/effects/splat.ogg', 50, 1)
var/damage = rand(10, 25) // Really fuck you up, this thing is big as fucc.
M.apply_damage(2 * damage, BRUTE, BP_HEAD)
M.apply_damage(2 * damage, BRUTE, BP_TORSO)
M.apply_damage(0.5 * damage, BRUTE, BP_L_LEG)
M.apply_damage(0.5 * damage, BRUTE, BP_R_LEG)
M.apply_damage(0.5 * damage, BRUTE, BP_L_ARM)
M.apply_damage(0.5 * damage, BRUTE, BP_R_ARM)
blood_splatter(src, M, 1)
..()

5
code/modules/mob/living/bot/mulebot_vr.dm Normal file
View File

@@ -0,0 +1,5 @@
/mob/living/bot/mulebot/handle_micro_bump_helping() // Can't drive over micros or macros regardless of intent.
return 0
/mob/living/bot/mulebot/handle_micro_bump_other() // Can't drive over micros or macros regardless of intent.
return 0

1
vorestation.dme
View File

@@ -2428,6 +2428,7 @@
#include "code\modules\mob\living\bot\floorbot.dm"
#include "code\modules\mob\living\bot\medbot.dm"
#include "code\modules\mob\living\bot\mulebot.dm"
#include "code\modules\mob\living\bot\mulebot_vr.dm"
#include "code\modules\mob\living\bot\secbot.dm"
#include "code\modules\mob\living\bot\SLed209bot.dm"
#include "code\modules\mob\living\carbon\breathe.dm"