diff --git a/code/modules/atmospherics/portable/canister.dm b/code/modules/atmospherics/portable/canister.dm index df466e8fd3bef..ca6e094782e11 100644 --- a/code/modules/atmospherics/portable/canister.dm +++ b/code/modules/atmospherics/portable/canister.dm @@ -706,6 +706,10 @@ ADMIN_INTERACT_PROCS(/obj/machinery/portable_atmospherics/canister, proc/toggle_ return return +/obj/machinery/portable_atmospherics/canister/damage_blunt(amount) + src.health -= amount + src.healthcheck() + /obj/machinery/portable_atmospherics/canister/toxins/New() ..() diff --git a/code/modules/transport/pods/vehicle.dm b/code/modules/transport/pods/vehicle.dm index 63c7cc7b2b22f..b79a34f6744f1 100644 --- a/code/modules/transport/pods/vehicle.dm +++ b/code/modules/transport/pods/vehicle.dm @@ -50,9 +50,9 @@ var/view_offset_y = 0 var/datum/movement_controller/movement_controller - var/req_smash_velocity = 9 //7 is the 'normal' cap right now + var/req_smash_velocity = 7 //7 is the 'normal' cap right now var/hitmob = 0 - var/ram_self_damage_multiplier = 0.09 + var/ram_self_damage_multiplier = 0.5 /// I got sick of having the comms type swapping code in 17 New() ship types /// so this is the initial type of comms array this vehicle will have @@ -583,7 +583,7 @@ if (get_move_velocity_magnitude() > 5) var/power = get_move_velocity_magnitude() - src.health -= min(power * ram_self_damage_multiplier,5) + src.health -= min(power * ram_self_damage_multiplier,10) checkhealth() if (istype(target, /obj/machinery/vehicle/)) @@ -634,15 +634,8 @@ D.try_force_open(src) if (istype(O, /obj/structure/girder) || istype(O, /obj/foamedmetal)) qdel(O) - - if (istype(target, /obj/window)) - var/obj/window/W = target - W.health = 0 - W.smash() - - if (istype(O, /obj/grille)) - var/obj/grille/G = target - G.damage_slashing(15) + var/obj_damage = 5 * power + target.damage_blunt(obj_damage) if (istype(O, /obj/table)) var/obj/table/table = target @@ -651,10 +644,6 @@ if (istype(O,/obj/machinery/vending)) var/obj/machinery/vending/V = O V.fall(src) - if (istype(O,/obj/machinery/portable_atmospherics/canister)) - var/obj/machinery/portable_atmospherics/canister/C = O - C.health -= power - C.healthcheck() logTheThing(LOG_COMBAT, src, "(piloted by [constructTarget(src.pilot,"combat")]) crashes into [constructTarget(target,"combat")] [log_loc(src)].") playsound(src.loc, 'sound/impact_sounds/Generic_Hit_Heavy_1.ogg', 40, 1) diff --git a/strings/changelog.txt b/strings/changelog.txt index f5b7cd1d97115..9121e243e6eee 100644 --- a/strings/changelog.txt +++ b/strings/changelog.txt @@ -1,5 +1,7 @@ (t)tue apr 18 23 +(u)LeahTheTech +(*)Pods and cars now damage things (windows, tables, vending machines) they crash into, and also take slightly more damage from said crashes. (u)Sord (+)Engineering manufacturers now have some more items available for production (+)Engineers now spawn with their own jumpsuits instead of mechanics jumpsuits