mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-31 03:52:31 +00:00
b570af6795
Moved last_bumped var from movable to living. Renamed /obj/machinery/field/proc/bump to bump_field() to avoid confusion with Bump(). Same thing with /obj/effect/mine/Bumped() -> triggermine(). Fixes sprite when hunter leaps into a wall. 10428 Removed some commented code here and there. Remove allow_spin var, throw_at now uses a spin argument for that. Throwpass atom var is no longer used to check whether thrown stuff can pass stuff (now using CanPass() proc like everything else), the var is still used for some adjacency click check. A thrown mob hitting another mob now produces a sound; also thrown mob and target one no longer swap places even on help intent. A thrown mob now is lightly hurt (and weakened) if he hits a wall/mob/dense object. Nerf the damage when thrown mob hit wall.(20 -> 10) Thrown obj/mob no longer bounces off wall unless it's no grav. Heavy thrown items now push an unanchored obj/mob target. Fixes losing all momentum when getting out of a thrown closet. 6569 A lot of work on throw_at, throw_impact, and hitby to make the code more OOP. Thrown items no longer collide with border items on the side. 10479 Fixes the killer crusher. 10507
12 lines
237 B
Plaintext
12 lines
237 B
Plaintext
/obj/item/weapon/
|
|
name = "weapon"
|
|
icon = 'icons/obj/weapons.dmi'
|
|
|
|
/obj/item/weapon/New()
|
|
..()
|
|
if(!hitsound)
|
|
if(damtype == "fire")
|
|
hitsound = 'sound/items/welder.ogg'
|
|
if(damtype == "brute")
|
|
hitsound = "swing_hit"
|