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

Sets w_class for external organs

Browse Source 
Adjusts the edge w_class requirement to require a weapon that is larger
than or equal to the limb's w_class. Also makes the surgical saw and
surgical drill w_class = 3, and the scalpel w_class = 1.
This commit is contained in:
mwerezak
2015-05-30 13:40:12 -04:00
parent f23a656526
commit d541fda7be
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/surgery_tools.dm
+3 -3
View File
@@ -61,7 +61,7 @@
matter = list(DEFAULT_WALL_MATERIAL = 15000, "glass" = 10000)
flags = CONDUCT
force = 15.0
w_class = 2.0
w_class = 3
origin_tech = "materials=1;biotech=1"
attack_verb = list("drilled")
@@ -82,7 +82,7 @@
force = 10.0
sharp = 1
edge = 1
w_class = 2.0
w_class = 1
throwforce = 5.0
throw_speed = 3
throw_range = 5
@@ -136,7 +136,7 @@
hitsound = 'sound/weapons/circsawhit.ogg'
flags = CONDUCT
force = 15.0
w_class = 2.0
w_class = 3
throwforce = 9.0
throw_speed = 3
throw_range = 5
code/modules/organs/organ_external.dm
+13 -3
View File
@@ -228,9 +228,12 @@
droplimb(0,DROPLIMB_BURN)
if(!dropped && prob(brute))
var/edge_eligible = 0
if(edge && istype(used_weapon,/obj/item))
var/obj/item/W = used_weapon
if(W.w_class >= 3)
if(edge)
if(istype(used_weapon,/obj/item))
var/obj/item/W = used_weapon
if(W.w_class >= w_class)
edge_eligible = 1
else
edge_eligible = 1
if(brute >= threshold || (edge_eligible && brute >= threshold/3))
@@ -996,6 +999,7 @@ Note that amputating the affected organ does in fact remove the infection from t
icon_name = "torso"
max_damage = 100
min_broken_damage = 35
w_class = 5
body_part = UPPER_TORSO
vital = 1
amputation_point = "spine"
@@ -1012,6 +1016,7 @@ Note that amputating the affected organ does in fact remove the infection from t
icon_name = "groin"
max_damage = 100
min_broken_damage = 35
w_class = 5
body_part = LOWER_TORSO
vital = 1
parent_organ = "chest"
@@ -1026,6 +1031,7 @@ Note that amputating the affected organ does in fact remove the infection from t
icon_name = "l_arm"
max_damage = 50
min_broken_damage = 30
w_class = 3
body_part = ARM_LEFT
parent_organ = "chest"
joint = "left elbow"
@@ -1046,6 +1052,7 @@ Note that amputating the affected organ does in fact remove the infection from t
icon_name = "l_leg"
max_damage = 50
min_broken_damage = 30
w_class = 3
body_part = LEG_LEFT
icon_position = LEFT
parent_organ = "groin"
@@ -1067,6 +1074,7 @@ Note that amputating the affected organ does in fact remove the infection from t
name = "left foot"
icon_name = "l_foot"
min_broken_damage = 15
w_class = 2
body_part = FOOT_LEFT
icon_position = LEFT
parent_organ = "l_leg"
@@ -1093,6 +1101,7 @@ Note that amputating the affected organ does in fact remove the infection from t
name = "left hand"
icon_name = "l_hand"
min_broken_damage = 15
w_class = 2
body_part = HAND_LEFT
parent_organ = "l_arm"
joint = "left wrist"
@@ -1118,6 +1127,7 @@ Note that amputating the affected organ does in fact remove the infection from t
name = "head"
max_damage = 75
min_broken_damage = 35
w_class = 3
body_part = HEAD
vital = 1
parent_organ = "chest"