cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 13:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hitby refactor (#19624)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/internal/brain.dm
+1 -1
View File
@@ -7,7 +7,7 @@
vital = TRUE
icon_state = "brain"
force = 1
w_class = ITEMSIZE_SMALL
w_class = WEIGHT_CLASS_SMALL
throwforce = 1.0
throw_speed = 3
throw_range = 5
code/modules/organs/subtypes/autakh.dm
+1 -1
View File
@@ -300,7 +300,7 @@
desc = "An integrated combitool module."
icon_state = "digitool"
item_state = "digitool"
w_class = ITEMSIZE_LARGE
w_class = WEIGHT_CLASS_BULKY
tools = list(
"crowbar",
"screwdriver",
code/modules/organs/subtypes/diona.dm
+7 -7
View File
@@ -36,7 +36,7 @@
icon_name = "torso"
max_damage = 200
min_broken_damage = 50
w_class = ITEMSIZE_HUGE
w_class = WEIGHT_CLASS_HUGE
body_part = UPPER_TORSO
vital = TRUE
parent_organ = null
@@ -51,7 +51,7 @@
icon_name = "groin"
max_damage = 100
min_broken_damage = 50
w_class = ITEMSIZE_LARGE
w_class = WEIGHT_CLASS_BULKY
body_part = LOWER_TORSO
parent_organ = BP_CHEST
limb_flags = ORGAN_CAN_MAIM | ORGAN_CAN_AMPUTATE
@@ -65,7 +65,7 @@
icon_name = "l_arm"
max_damage = 35
min_broken_damage = 20
w_class = ITEMSIZE_NORMAL
w_class = WEIGHT_CLASS_NORMAL
body_part = ARM_LEFT
parent_organ = BP_CHEST
limb_flags = ORGAN_CAN_MAIM | ORGAN_CAN_AMPUTATE | ORGAN_CAN_GRASP
@@ -89,7 +89,7 @@
icon_name = "l_leg"
max_damage = 35
min_broken_damage = 20
w_class = ITEMSIZE_NORMAL
w_class = WEIGHT_CLASS_NORMAL
body_part = LEG_LEFT
icon_position = LEFT
parent_organ = BP_GROIN
@@ -115,7 +115,7 @@
icon_name = "l_foot"
max_damage = 20
min_broken_damage = 10
w_class = ITEMSIZE_SMALL
w_class = WEIGHT_CLASS_SMALL
body_part = FOOT_LEFT
icon_position = LEFT
parent_organ = BP_L_LEG
@@ -142,7 +142,7 @@
icon_name = "l_hand"
max_damage = 30
min_broken_damage = 15
w_class = ITEMSIZE_SMALL
w_class = WEIGHT_CLASS_SMALL
body_part = HAND_LEFT
parent_organ = BP_L_ARM
limb_flags = ORGAN_CAN_MAIM | ORGAN_CAN_AMPUTATE | ORGAN_CAN_GRASP
@@ -167,7 +167,7 @@
name = BP_HEAD
max_damage = 50
min_broken_damage = 25
w_class = ITEMSIZE_NORMAL
w_class = WEIGHT_CLASS_NORMAL
body_part = HEAD
parent_organ = BP_CHEST
limb_flags = ORGAN_CAN_MAIM | ORGAN_CAN_AMPUTATE
code/modules/organs/subtypes/standard.dm
+7 -7
View File
@@ -8,7 +8,7 @@
icon_name = "torso"
max_damage = 100
min_broken_damage = 35
w_class = ITEMSIZE_HUGE
w_class = WEIGHT_CLASS_HUGE
body_part = UPPER_TORSO
vital = TRUE
amputation_point = "spine"
@@ -33,7 +33,7 @@
icon_name = "groin"
max_damage = 100
min_broken_damage = 35
w_class = ITEMSIZE_LARGE
w_class = WEIGHT_CLASS_BULKY
body_part = LOWER_TORSO
parent_organ = BP_CHEST
amputation_point = "lumbar"
@@ -73,7 +73,7 @@
icon_name = "l_arm"
max_damage = 65
min_broken_damage = 30
w_class = ITEMSIZE_NORMAL
w_class = WEIGHT_CLASS_NORMAL
body_part = ARM_LEFT
parent_organ = BP_CHEST
joint = "left elbow"
@@ -106,7 +106,7 @@
icon_name = "l_leg"
max_damage = 65
min_broken_damage = 30
w_class = ITEMSIZE_NORMAL
w_class = WEIGHT_CLASS_NORMAL
body_part = LEG_LEFT
icon_position = LEFT
parent_organ = BP_GROIN
@@ -139,7 +139,7 @@
icon_name = "l_foot"
max_damage = 50
min_broken_damage = 15
w_class = ITEMSIZE_SMALL
w_class = WEIGHT_CLASS_SMALL
body_part = FOOT_LEFT
icon_position = LEFT
parent_organ = BP_L_LEG
@@ -176,7 +176,7 @@
icon_name = "l_hand"
max_damage = 50
min_broken_damage = 15
w_class = ITEMSIZE_SMALL
w_class = WEIGHT_CLASS_SMALL
body_part = HAND_LEFT
parent_organ = BP_L_ARM
joint = "left wrist"
@@ -221,7 +221,7 @@
name = BP_HEAD
max_damage = 75
min_broken_damage = 35
w_class = ITEMSIZE_NORMAL
w_class = WEIGHT_CLASS_NORMAL
body_part = HEAD | FACE
vital = TRUE
parent_organ = BP_CHEST