Hitby refactor (#19624)

Refactored hitby to be in line with TG's version.
Refactored item weight defines to a more clear naming scheme, also in
line with TG's version.
Refactored how the movement bumps are handled, ported signals to handle
them, in preparation for the movement update.
Fixed disposal hit bouncing the hitting atom on the wall.
Items do not push other items anymore if they are tiny.
This commit is contained in:
Fluffy
2024-07-28 20:52:08 +00:00
committed by GitHub
parent b84acb8e03
commit a3a4d46fa7
510 changed files with 2282 additions and 1584 deletions
+1 -1
View File
@@ -9,7 +9,7 @@
obj_flags = OBJ_FLAG_CONDUCTABLE
force = 0
throwforce = 0.0
w_class = ITEMSIZE_TINY
w_class = WEIGHT_CLASS_TINY
slot_flags = SLOT_EARS
drop_sound = 'sound/items/drop/ring.ogg'
pickup_sound = 'sound/items/pickup/ring.ogg'
+15 -15
View File
@@ -14,7 +14,7 @@
slot_flags = SLOT_BELT
throwforce = 4.0
force = 15
w_class = ITEMSIZE_LARGE
w_class = WEIGHT_CLASS_BULKY
matter = list(DEFAULT_WALL_MATERIAL = 3750)
var/digspeed //moving the delay to an item var so R&D can make improved picks. --NEO
origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1)
@@ -149,7 +149,7 @@
attack_self(usr)
/obj/item/pickaxe/offhand
w_class = ITEMSIZE_HUGE
w_class = WEIGHT_CLASS_HUGE
icon = 'icons/obj/weapons.dmi'
icon_state = "offhand"
item_state = null
@@ -329,7 +329,7 @@
slot_flags = SLOT_BELT
force = 18
throwforce = 4.0
w_class = ITEMSIZE_NORMAL
w_class = WEIGHT_CLASS_NORMAL
origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1)
matter = list(DEFAULT_WALL_MATERIAL = 50)
attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")
@@ -353,7 +353,7 @@
item_state = "spade"
force = 11
throwforce = 7.0
w_class = ITEMSIZE_SMALL
w_class = WEIGHT_CLASS_SMALL
/obj/item/shovel/gadpathur
name = "trench shovel"
@@ -361,7 +361,7 @@
icon_state = "gadpathur_shovel"
item_state = "gadpathur_shovel"
force = 15
w_class = ITEMSIZE_NORMAL
w_class = WEIGHT_CLASS_NORMAL
origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1, TECH_COMBAT = 2)
attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked", "slashed", "cut")
sharp = TRUE
@@ -377,7 +377,7 @@
singular_name = "flag"
amount = 25
max_amount = 25
w_class = ITEMSIZE_SMALL
w_class = WEIGHT_CLASS_SMALL
icon = 'icons/obj/mining.dmi'
var/upright = FALSE
var/base_state
@@ -478,7 +478,7 @@
icon_state = "track15"
density = FALSE
anchored = TRUE
w_class = ITEMSIZE_NORMAL
w_class = WEIGHT_CLASS_NORMAL
layer = 2.44
/obj/structure/track/Initialize()
@@ -609,7 +609,7 @@
desc = "A keyring with a small steel key, and a pickaxe shaped fob."
icon = 'icons/obj/vehicles.dmi'
icon_state = "mine_keys"
w_class = ITEMSIZE_TINY
w_class = WEIGHT_CLASS_TINY
/**********************Pinpointer**********************/
@@ -620,7 +620,7 @@
icon_state = "pinoff"
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
w_class = ITEMSIZE_SMALL
w_class = WEIGHT_CLASS_SMALL
item_state = "electronic"
throw_speed = 4
throw_range = 20
@@ -687,7 +687,7 @@
icon_state = "jaunter"
item_state = "jaunter"
throwforce = 0
w_class = ITEMSIZE_SMALL
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 5
slot_flags = SLOT_BELT
@@ -777,7 +777,7 @@
item_state = "lazarus_loaded"
contained_sprite = TRUE
throwforce = 0
w_class = ITEMSIZE_SMALL
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 5
var/loaded = TRUE
@@ -890,7 +890,7 @@ var/list/total_extraction_beacons = list()
contained_sprite = TRUE
icon = 'icons/obj/mining_contained.dmi'
icon_state = "fulton"
w_class = ITEMSIZE_NORMAL
w_class = WEIGHT_CLASS_NORMAL
var/obj/structure/extraction_point/beacon
var/list/beacon_networks = list("station")
var/uses_left = 3
@@ -1002,7 +1002,7 @@ var/list/total_extraction_beacons = list()
icon_state = "resonator"
item_state = "resonator"
desc = "A handheld device that creates small fields of energy that resonate until they detonate, crushing rock. It can also be activated without a target to create a field at the user's location, to act as a delayed time trap. It's more effective in a vacuum."
w_class = ITEMSIZE_NORMAL
w_class = WEIGHT_CLASS_NORMAL
force = 22
throwforce = 10
var/burst_time = 30
@@ -1100,7 +1100,7 @@ var/list/total_extraction_beacons = list()
icon_state = "magneto"
item_state = "magneto"
desc = "A handheld device that creates a well of negative force that attracts minerals of a very specific type, size, and state to its user."
w_class = ITEMSIZE_NORMAL
w_class = WEIGHT_CLASS_NORMAL
force = 15
throwforce = 5
origin_tech = list(TECH_MAGNET = 4, TECH_ENGINEERING = 3)
@@ -1138,7 +1138,7 @@ var/list/total_extraction_beacons = list()
icon_state = "supermagneto"
item_state = "jaunter"
desc = "A handheld device that creates a well of warp energy that teleports minerals of a very specific type, size, and state to its user."
w_class = ITEMSIZE_NORMAL
w_class = WEIGHT_CLASS_NORMAL
force = 22
throwforce = 5
origin_tech = list(TECH_BLUESPACE = 4, TECH_ENGINEERING = 3)
+1 -1
View File
@@ -407,7 +407,7 @@ var/list/mineral_can_smooth_with = list(
visible_message(SPAN_NOTICE("An old dusty crate was buried within!"))
new /obj/structure/closet/crate/secure/loot(src)
/turf/simulated/mineral/ChangeTurf(N, tell_universe, force_lighting_update, ignore_override, mapload)
/turf/simulated/mineral/ChangeTurf(path, tell_universe, force_lighting_update, ignore_override, mapload)
var/old_has_resources = has_resources
var/list/old_resources = resources
var/image/old_resource_indicator = resource_indicator
+1 -1
View File
@@ -3,7 +3,7 @@
icon = 'icons/obj/item/ore.dmi'
icon_state = "ore"
randpixel = 8
w_class = ITEMSIZE_SMALL
w_class = WEIGHT_CLASS_SMALL
throwforce = 10
var/datum/geosample/geologic_data
var/material
+1 -1
View File
@@ -12,7 +12,7 @@
icon = 'icons/obj/item/tools/ore_scanner.dmi'
icon_state = "ore_scanner"
item_state = "ore_scanner"
w_class = ITEMSIZE_SMALL
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
force = 1
var/active = FALSE