From 05a24da2e815247f9681d67ba6bea2c748ab7aeb Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sat, 1 Jul 2017 19:48:43 -0400 Subject: [PATCH] The Most Non-Edgey PR Ever --- code/__DEFINES/mob.dm | 2 +- code/__HELPERS/unsorted.dm | 17 ++++++----------- code/datums/spells/rathens.dm | 2 +- code/game/dna/genes/goon_powers.dm | 2 +- .../gamemodes/changeling/powers/mutations.dm | 1 - code/game/gamemodes/cult/cult_items.dm | 1 - code/game/gamemodes/wizard/artefact.dm | 1 - code/game/objects/items/weapons/holy_weapons.dm | 8 -------- code/game/objects/items/weapons/kitchen.dm | 2 -- code/game/objects/items/weapons/melee/energy.dm | 4 ---- code/game/objects/items/weapons/melee/misc.dm | 1 - code/game/objects/items/weapons/scissors.dm | 3 +-- code/game/objects/items/weapons/shards.dm | 1 - code/game/objects/items/weapons/tools.dm | 1 - code/game/objects/items/weapons/twohanded.dm | 6 ------ code/game/objects/items/weapons/weaponry.dm | 3 --- code/game/objects/items/weapons/whetstone.dm | 3 +-- code/game/objects/objs.dm | 1 - code/modules/clothing/glasses/glasses.dm | 1 - code/modules/customitems/item_defines.dm | 1 - .../food_and_drinks/drinks/drinks/bottle.dm | 1 - code/modules/hydroponics/hydroitemdefines.dm | 6 +----- code/modules/mining/equipment_locker.dm | 1 - .../mining/lavaland/loot/ashdragon_loot.dm | 1 - code/modules/mining/mine_items.dm | 1 - code/modules/mob/living/carbon/human/death.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 6 +++--- .../mob/living/carbon/human/human_attackhand.dm | 2 +- .../mob/living/carbon/human/human_damage.dm | 14 +++++++------- .../mob/living/carbon/human/human_defense.dm | 10 ++++------ .../mob/living/carbon/human/species/species.dm | 2 -- code/modules/mob/living/damage_procs.dm | 2 +- code/modules/mob/living/living_defense.dm | 10 ++-------- .../mob/living/silicon/robot/component.dm | 8 +++++--- .../mob/living/silicon/robot/robot_damage.dm | 8 ++++---- code/modules/mob/living/simple_animal/parrot.dm | 2 +- code/modules/paperwork/pen.dm | 2 -- code/modules/projectiles/guns/alien.dm | 2 -- code/modules/projectiles/guns/energy/special.dm | 1 - code/modules/projectiles/guns/magic/staff.dm | 3 +-- code/modules/projectiles/guns/projectile/bow.dm | 1 - code/modules/projectiles/guns/throw/crossbow.dm | 1 - code/modules/projectiles/projectile/bullets.dm | 9 --------- code/modules/projectiles/projectile/reusable.dm | 1 - code/modules/projectiles/projectile/special.dm | 2 -- .../xenoarchaeology/finds/finds_misc.dm | 1 - code/modules/surgery/face.dm | 2 +- code/modules/surgery/generic.dm | 4 ++-- code/modules/surgery/limb_reattach.dm | 6 +++--- .../modules/surgery/organs/augments_internal.dm | 4 ++-- code/modules/surgery/organs/organ.dm | 2 +- code/modules/surgery/organs/organ_external.dm | 14 +++++++------- .../modules/surgery/organs/subtypes/standard.dm | 4 ++-- code/modules/surgery/organs/wound.dm | 10 +++++----- code/modules/surgery/robotics.dm | 2 +- code/modules/surgery/tools.dm | 3 --- 56 files changed, 66 insertions(+), 145 deletions(-) diff --git a/code/__DEFINES/mob.dm b/code/__DEFINES/mob.dm index 36fffdd907a..588f8526ca1 100644 --- a/code/__DEFINES/mob.dm +++ b/code/__DEFINES/mob.dm @@ -14,7 +14,7 @@ #define ORGAN_MUTATED 2048 #define ORGAN_ASSISTED 4096 -#define DROPLIMB_EDGE 0 +#define DROPLIMB_SHARP 0 #define DROPLIMB_BLUNT 1 #define DROPLIMB_BURN 2 diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 82b2ea8b419..dba28dcb914 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1187,16 +1187,11 @@ var/global/list/common_tools = list( return 0 //Whether or not the given item counts as sharp in terms of dealing damage -/proc/is_sharp(obj/O as obj) - if(!O) return 0 - if(O.sharp) return 1 - if(O.edge) return 1 - return 0 - -//Whether or not the given item counts as cutting with an edge in terms of removing limbs -/proc/has_edge(obj/O as obj) - if(!O) return 0 - if(O.edge) return 1 +/proc/is_sharp(obj/O) + if(!O) + return 0 + if(O.sharp) + return 1 return 0 //Returns 1 if the given item is capable of popping things like balloons, inflatable barriers, or cutting police tape. @@ -1891,4 +1886,4 @@ var/global/list/g_fancy_list_of_types = null var/num = pick(num_sample) num_sample -= num result += (1 << num) - return result + return result diff --git a/code/datums/spells/rathens.dm b/code/datums/spells/rathens.dm index 75ff2525c4d..b5cc7b63f51 100644 --- a/code/datums/spells/rathens.dm +++ b/code/datums/spells/rathens.dm @@ -42,4 +42,4 @@ continue if(prob(7)) to_chat(H, "Your [E] was severed by the explosion!") - E.droplimb(1, DROPLIMB_EDGE, 0, 1) + E.droplimb(1, DROPLIMB_SHARP, 0, 1) diff --git a/code/game/dna/genes/goon_powers.dm b/code/game/dna/genes/goon_powers.dm index 52b62f6cabf..c16a883e00d 100644 --- a/code/game/dna/genes/goon_powers.dm +++ b/code/game/dna/genes/goon_powers.dm @@ -356,7 +356,7 @@ return user.visible_message("[user] [pick("chomps","bites")] off [the_item]'s [limb]!") playsound(user.loc, 'sound/items/eatfood.ogg', 50, 0) - limb.droplimb(0, DROPLIMB_EDGE) + limb.droplimb(0, DROPLIMB_SHARP) doHeal(user) else user.visible_message("[user] eats \the [the_item].") diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index 57f086b46ed..13378f6ff8e 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -130,7 +130,6 @@ flags = ABSTRACT | NODROP w_class = WEIGHT_CLASS_HUGE sharp = 1 - edge = 1 force = 25 throwforce = 0 //Just to be on the safe side throw_range = 0 diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 97511414e7a..801ab1c138d 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -7,7 +7,6 @@ force = 30 throwforce = 10 sharp = 1 - edge = 1 hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 4f9af54457c..cf9946319a8 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -231,7 +231,6 @@ var/global/list/multiverse = list() force = 20 throwforce = 10 sharp = 1 - edge = 1 w_class = WEIGHT_CLASS_SMALL attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") var/faction = list("unassigned") diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index c4c4175d2fa..968aac67272 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -100,7 +100,6 @@ slot_flags = SLOT_BACK|SLOT_BELT block_chance = 30 sharp = 1 - edge = 1 hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") @@ -187,7 +186,6 @@ armour_penetration = 35 slot_flags = SLOT_BACK sharp = 1 - edge = 1 attack_verb = list("chopped", "sliced", "cut", "reaped") hitsound = 'sound/weapons/rapierhit.ogg' @@ -266,7 +264,6 @@ w_class = WEIGHT_CLASS_HUGE flags = NODROP | ABSTRACT sharp = 1 - edge = 1 attack_verb = list("sawed", "torn", "cut", "chopped", "diced") hitsound = 'sound/weapons/chainsaw.ogg' @@ -278,7 +275,6 @@ desc = "Used for absolutely hilarious sacrifices." hitsound = 'sound/items/bikehorn.ogg' sharp = 1 - edge = 1 attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut", "honked") /obj/item/weapon/nullrod/whip @@ -324,7 +320,6 @@ flags = ABSTRACT | NODROP w_class = WEIGHT_CLASS_HUGE sharp = 1 - edge = 1 /obj/item/weapon/nullrod/carp name = "carp-sie plushie" @@ -354,7 +349,6 @@ block_chance = 40 slot_flags = SLOT_BACK sharp = 0 - edge = 0 hitsound = "swing_hit" attack_verb = list("smashed", "slammed", "whacked", "thwacked") icon = 'icons/obj/weapons.dmi' @@ -368,7 +362,6 @@ w_class = WEIGHT_CLASS_HUGE desc = "They say fear is the true mind killer, but stabbing them in the head works too. Honour compels you to not sheathe it once drawn." sharp = 1 - edge = 1 slot_flags = null flags = HANDSLOW hitsound = 'sound/weapons/bladeslice.ogg' @@ -394,7 +387,6 @@ attack_verb = list("poked", "impaled", "pierced", "jabbed") hitsound = 'sound/weapons/bladeslice.ogg' sharp = 1 - edge = 1 /obj/item/weapon/nullrod/rosary name = "prayer beads" diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 13bc85999e0..9faba432ccf 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -100,7 +100,6 @@ attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") no_embed = 1 sharp = 1 - edge = 1 /obj/item/weapon/kitchen/knife/suicide_act(mob/user) user.visible_message(pick("[user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \ @@ -114,7 +113,6 @@ icon_state = "pknife" item_state = "knife" sharp = 0 - edge = 0 /obj/item/weapon/kitchen/knife/ritual name = "ritual knife" diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 1c1dbbd8363..992cd301547 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -70,7 +70,6 @@ attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") attack_verb_on = list() sharp = 1 - edge = 1 /obj/item/weapon/melee/energy/axe/suicide_act(mob/user) user.visible_message("[user] swings the [src.name] towards /his head! It looks like \he's trying to commit suicide.") @@ -89,7 +88,6 @@ origin_tech = "combat=3;magnets=4;syndicate=4" block_chance = 50 sharp = 1 - edge = 1 var/hacked = 0 var/blade_color @@ -121,7 +119,6 @@ force_on = 30 force = 18 //About as much as a spear sharp = 1 - edge = 1 hitsound = 'sound/weapons/circsawhit.ogg' icon = 'icons/obj/surgery.dmi' icon_state = "esaw_0" @@ -202,7 +199,6 @@ icon_state = "blade" force = 30 sharp = 1 - edge = 1 throwforce = 1//Throwing or dropping the item deletes it. throw_speed = 3 throw_range = 1 diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index f4ccf9fac65..22f4393c94f 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -32,7 +32,6 @@ block_chance = 50 armour_penetration = 75 sharp = 1 - edge = 1 origin_tech = "combat=5" attack_verb = list("lunged at", "stabbed") hitsound = 'sound/weapons/rapierhit.ogg' diff --git a/code/game/objects/items/weapons/scissors.dm b/code/game/objects/items/weapons/scissors.dm index 362fcf1c2d3..345d2d2a571 100644 --- a/code/game/objects/items/weapons/scissors.dm +++ b/code/game/objects/items/weapons/scissors.dm @@ -5,7 +5,6 @@ item_state = "scissor" force = 5 sharp = 1 - edge = 1 w_class = WEIGHT_CLASS_SMALL hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("slices", "cuts", "stabs", "jabs") @@ -117,7 +116,7 @@ playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) user.visible_message("[user] abruptly stops cutting [M]'s hair and slices their throat!", "You stop cutting [M]'s hair and slice their throat!") //Just a little off the top. H.AdjustLoseBreath(10) //30 Oxy damage over time - H.apply_damage(18, BRUTE, "head", sharp =1, edge =1, used_weapon = "scissors") + H.apply_damage(18, BRUTE, "head", sharp =1, used_weapon = "scissors") var/turf/location = get_turf(H) if(istype(location, /turf/simulated)) location.add_blood(H) diff --git a/code/game/objects/items/weapons/shards.dm b/code/game/objects/items/weapons/shards.dm index 554347224eb..2eab01868c8 100644 --- a/code/game/objects/items/weapons/shards.dm +++ b/code/game/objects/items/weapons/shards.dm @@ -5,7 +5,6 @@ icon = 'icons/obj/shards.dmi' icon_state = "large" sharp = 1 - edge = 1 desc = "Could probably be used as ... a throwing weapon?" w_class = WEIGHT_CLASS_TINY force = 5.0 diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 2f57e9157ee..3ad0a28823a 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -228,7 +228,6 @@ hitsound = 'sound/items/Wirecutter.ogg' usesound = 'sound/items/Wirecutter.ogg' sharp = 1 - edge = 1 toolspeed = 1 /obj/item/weapon/wirecutters/New(loc, param_color = null) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index cdd8b8a5de1..ac1e984808b 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -162,7 +162,6 @@ force = 5 throwforce = 15 sharp = 1 - edge = 1 w_class = WEIGHT_CLASS_BULKY slot_flags = SLOT_BACK force_unwielded = 5 @@ -209,7 +208,6 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") block_chance = 75 sharp = 1 - edge = 1 no_embed = 1 // Like with the single-handed esword, this shouldn't be embedding in people. /obj/item/weapon/twohanded/dualsaber/New() @@ -297,7 +295,6 @@ hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "poked", "jabbed", "torn", "gored") sharp = 1 - edge = 1 no_spin_thrown = 1 var/obj/item/weapon/grenade/explosive = null var/war_cry = "AAAAARGH!!!" @@ -442,7 +439,6 @@ attack_verb = list("sawed", "cut", "hacked", "carved", "cleaved", "butchered", "felled", "timbered") hitsound = "swing_hit" sharp = 1 - edge = 1 actions_types = list(/datum/action/item_action/startchainsaw) var/on = 0 @@ -499,7 +495,6 @@ origin_tech = "materials=6;syndicate=4" attack_verb = list("sawed", "cut", "hacked", "carved", "cleaved", "butchered", "felled", "timbered") sharp = 1 - edge = 1 no_embed = 1 /obj/item/weapon/twohanded/chainsaw/update_icon() @@ -718,7 +713,6 @@ force = 5 throwforce = 15 sharp = 1 - edge = 1 w_class = WEIGHT_CLASS_HUGE armour_penetration = 20 slot_flags = SLOT_BACK diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 95317b7f0a6..d6dbdaae075 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -43,7 +43,6 @@ force = 40 throwforce = 10 sharp = 1 - edge = 1 w_class = WEIGHT_CLASS_NORMAL attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") block_chance = 50 @@ -67,7 +66,6 @@ force = 40 throwforce = 10 sharp = 1 - edge = 1 w_class = WEIGHT_CLASS_NORMAL hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") @@ -83,7 +81,6 @@ /obj/item/weapon/harpoon name = "harpoon" sharp = 1 - edge = 0 desc = "Tharr she blows!" icon_state = "harpoon" item_state = "harpoon" diff --git a/code/game/objects/items/weapons/whetstone.dm b/code/game/objects/items/weapons/whetstone.dm index b268540f92a..c4595f2deb6 100644 --- a/code/game/objects/items/weapons/whetstone.dm +++ b/code/game/objects/items/weapons/whetstone.dm @@ -19,7 +19,7 @@ if(I.force >= max || I.throwforce >= max)//no esword sharpening to_chat(user, "[I] is much too powerful to sharpen further.") return - if(requires_sharpness && !I.edge) + if(requires_sharpness && !I.sharp) to_chat(user, "You can only sharpen items that are already sharp, such as knives.") return if(istype(I, /obj/item/weapon/twohanded))//some twohanded items should still be sharpenable, but handle force differently. therefore i need this stuff @@ -39,7 +39,6 @@ return user.visible_message("[user] sharpens [I] with [src]!", "You sharpen [I], making it much more deadly than before.") if(!requires_sharpness) - I.edge = 1 I.sharp = 1 I.force = Clamp(I.force + increment, 0, max) I.throwforce = Clamp(I.throwforce + increment, 0, max) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 844c1828200..d1f1372caf3 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -8,7 +8,6 @@ var/throwforce = 1 var/list/attack_verb = list() //Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]" var/sharp = 0 // whether this object cuts - var/edge = 0 // whether this object is more likely to dismember var/in_use = 0 // If we have a user using us, this will be set on. We will check if the user has stopped using us, and thus stop updating and LAGGING EVERYTHING! var/damtype = "brute" diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index c7c7c3afcb0..31a624ffcc4 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -69,7 +69,6 @@ attack_verb = list("sliced") hitsound = 'sound/weapons/bladeslice.ogg' sharp = 1 - edge = 1 /obj/item/clothing/glasses/meson/cyber name = "Eye Replacement Implant" diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index c5344b2a9ab..90f0fcf4949 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -131,7 +131,6 @@ desc = "A replica claymore with strange markings scratched into the blade." force = 5 sharp = 0 - edge = 0 /obj/item/weapon/claymore/fluff/hit_reaction() return 0 diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 011a4ffacde..fc21b30150b 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -136,7 +136,6 @@ attack_verb = list("stabbed", "slashed", "attacked") var/icon/broken_outline = icon('icons/obj/drinks.dmi', "broken") sharp = 1 - edge = 1 /obj/item/weapon/reagent_containers/food/drinks/bottle/gin name = "Griffeater Gin" diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 9a93d1a9673..cee72938fc6 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -89,7 +89,6 @@ attack_verb = list("chopped", "torn", "cut") hitsound = 'sound/weapons/bladeslice.ogg' sharp = 1 - edge = 1 /obj/item/weapon/hatchet/suicide_act(mob/user) user.visible_message("[user] is chopping at \himself with the [src.name]! It looks like \he's trying to commit suicide.") @@ -119,7 +118,6 @@ attack_verb = list("chopped", "sliced", "cut", "reaped") hitsound = 'sound/weapons/bladeslice.ogg' sharp = 1 - edge = 1 var/extend = 1 /obj/item/weapon/scythe/suicide_act(mob/user) @@ -128,7 +126,7 @@ var/mob/living/carbon/human/H = user var/obj/item/organ/external/affecting = H.get_organ("head") if(affecting) - affecting.droplimb(1, DROPLIMB_EDGE) + affecting.droplimb(1, DROPLIMB_SHARP) playsound(loc, pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg'), 50, 1, -1) return (BRUTELOSS) @@ -139,7 +137,6 @@ desc = "A sharp and curved blade on a collapsable fibre metal handle, this tool is the pinnacle of covert reaping technology." force = 3 sharp = 0 - edge = 0 w_class = WEIGHT_CLASS_SMALL extend = 0 slot_flags = SLOT_BELT @@ -172,7 +169,6 @@ //Collapse sound (blade sheath) playsound(src.loc, 'sound/weapons/blade_sheath.ogg', 50, 1) //Sound credit to Q.K. of Freesound.org sharp = extend - edge = extend if(ishuman(user)) var/mob/living/carbon/human/H = user H.update_inv_l_hand() diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 2fe650f66e6..541961e5297 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -978,7 +978,6 @@ hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("smashes", "crushes", "cleaves", "chops", "pulps") sharp = 1 - edge = 1 var/charged = 1 var/charge_time = 16 var/atom/mark = null diff --git a/code/modules/mining/lavaland/loot/ashdragon_loot.dm b/code/modules/mining/lavaland/loot/ashdragon_loot.dm index 418d00c6f19..c3b43e06d6f 100644 --- a/code/modules/mining/lavaland/loot/ashdragon_loot.dm +++ b/code/modules/mining/lavaland/loot/ashdragon_loot.dm @@ -24,7 +24,6 @@ item_state = "spectral" flags = CONDUCT sharp = 1 - edge = 1 w_class = WEIGHT_CLASS_BULKY force = 1 throwforce = 1 diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 7852fe0edd8..d6e50861ee5 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -87,7 +87,6 @@ var/list/digsound = list('sound/effects/picaxe1.ogg','sound/effects/picaxe2.ogg','sound/effects/picaxe3.ogg') var/drill_verb = "picking" sharp = 1 - edge = 1 var/excavation_amount = 100 usesound = 'sound/effects/picaxe1.ogg' toolspeed = 1 diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 206571bec93..bbc45bf3ce0 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -28,7 +28,7 @@ // Only make the limb drop if it's not too damaged if(prob(100 - E.get_damage())) // Override the current limb status and don't cause an explosion - E.droplimb(DROPLIMB_EDGE) + E.droplimb(DROPLIMB_SHARP) for(var/mob/M in src) if(M in stomach_contents) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index ba55801c522..55993dbf5f5 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -226,7 +226,7 @@ while(limbs_affected != 0 && valid_limbs.len > 0) processing_dismember = pick(valid_limbs) if(processing_dismember.limb_name != "chest" && processing_dismember.limb_name != "head" && processing_dismember.limb_name != "groin") - processing_dismember.droplimb(1,DROPLIMB_EDGE,0,1) + processing_dismember.droplimb(1,DROPLIMB_SHARP,0,1) valid_limbs -= processing_dismember limbs_affected -= 1 else valid_limbs -= processing_dismember @@ -252,7 +252,7 @@ while(limbs_affected != 0 && valid_limbs.len > 0) processing_dismember = pick(valid_limbs) if(processing_dismember.limb_name != "chest" && processing_dismember.limb_name != "head" && processing_dismember.limb_name != "groin") - processing_dismember.droplimb(1,DROPLIMB_EDGE,0,1) + processing_dismember.droplimb(1,DROPLIMB_SHARP,0,1) valid_limbs -= processing_dismember limbs_affected -= 1 else valid_limbs -= processing_dismember @@ -277,7 +277,7 @@ while(limbs_affected != 0 && valid_limbs.len > 0) processing_dismember = pick(valid_limbs) if(processing_dismember.limb_name != "chest" && processing_dismember.limb_name != "head" && processing_dismember.limb_name != "groin") - processing_dismember.droplimb(1,DROPLIMB_EDGE,0,1) + processing_dismember.droplimb(1,DROPLIMB_SHARP,0,1) valid_limbs -= processing_dismember limbs_affected -= 1 else valid_limbs -= processing_dismember diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 59c8f3efa63..8d378d01e43 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -158,7 +158,7 @@ visible_message("[M] [pick(attack.attack_verb)]ed [src]!") - apply_damage(damage, BRUTE, affecting, armor_block, sharp=attack.sharp, edge=attack.edge) //moving this back here means Armalis are going to knock you down 70% of the time, but they're pure adminbus anyway. + apply_damage(damage, BRUTE, affecting, armor_block, sharp = attack.sharp) //moving this back here means Armalis are going to knock you down 70% of the time, but they're pure adminbus anyway. if((stat != DEAD) && damage >= M.species.punchstunthreshold) visible_message("[M] has weakened [src]!", \ "[M] has weakened [src]!") diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 04c8ffc9f57..4b1e8e66b1b 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -112,7 +112,7 @@ var/obj/item/organ/external/O = get_organ(organ_name) if(amount > 0) - O.take_damage(amount, 0, sharp=is_sharp(damage_source), edge=has_edge(damage_source), used_weapon=damage_source) + O.take_damage(amount, 0, sharp=is_sharp(damage_source), used_weapon=damage_source) else //if you don't want to heal robot organs, they you will have to check that yourself before using this proc. O.heal_damage(-amount, 0, internal=0, robo_repair=(O.status & ORGAN_ROBOT)) @@ -126,7 +126,7 @@ var/obj/item/organ/external/O = get_organ(organ_name) if(amount > 0) - O.take_damage(0, amount, sharp=is_sharp(damage_source), edge=has_edge(damage_source), used_weapon=damage_source) + O.take_damage(0, amount, sharp=is_sharp(damage_source), used_weapon=damage_source) else //if you don't want to heal robot organs, they you will have to check that yourself before using this proc. O.heal_damage(0, -amount, internal=0, robo_repair=(O.status & ORGAN_ROBOT)) @@ -240,7 +240,7 @@ if(!parts.len) return var/obj/item/organ/external/picked = pick(parts) - if(picked.take_damage(brute,burn,sharp,edge)) + if(picked.take_damage(brute, burn, sharp)) UpdateDamageIcon() updatehealth() speech_problem_flag = 1 @@ -285,7 +285,7 @@ var/burn_was = picked.burn_dam - update |= picked.take_damage(brute_per_part,burn_per_part,sharp,edge,used_weapon) + update |= picked.take_damage(brute_per_part, burn_per_part, sharp, used_weapon) brute -= (picked.brute_dam - brute_was) burn -= (picked.burn_dam - burn_was) @@ -333,7 +333,7 @@ This function restores all organs. return bodyparts_by_name[zone] -/mob/living/carbon/human/apply_damage(damage = 0, damagetype = BRUTE, def_zone = null, blocked = 0, sharp = 0, edge = 0, obj/used_weapon = null) +/mob/living/carbon/human/apply_damage(damage = 0, damagetype = BRUTE, def_zone = null, blocked = 0, sharp = 0, obj/used_weapon = null) //Handle other types of damage if((damagetype != BRUTE) && (damagetype != BURN)) ..(damage, damagetype, def_zone, blocked) @@ -364,7 +364,7 @@ This function restores all organs. if(species) damage = damage * species.brute_mod - if(organ.take_damage(damage, 0, sharp, edge, used_weapon)) + if(organ.take_damage(damage, 0, sharp, used_weapon)) UpdateDamageIcon() if(LAssailant && ishuman(LAssailant)) //superheros still get the comical hit markers @@ -389,7 +389,7 @@ This function restores all organs. if(species) damage = damage * species.burn_mod - if(organ.take_damage(0, damage, sharp, edge, used_weapon)) + if(organ.take_damage(0, damage, sharp, used_weapon)) UpdateDamageIcon() // Will set our damageoverlay icon to the next level, which will then be set back to the normal level the next mob.Life(). diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index bbe57fa66f9..ef7cfef5e31 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -61,7 +61,7 @@ emp_act /mob/living/carbon/human/check_projectile_dismemberment(obj/item/projectile/P, def_zone) var/obj/item/organ/external/affecting = get_organ(check_zone(def_zone)) if(affecting && !affecting.cannot_amputate && affecting.get_damage() >= (affecting.max_damage - P.dismemberment)) - var/damtype = DROPLIMB_EDGE + var/damtype = DROPLIMB_SHARP switch(P.damage_type) if(BRUTE) damtype = DROPLIMB_BLUNT @@ -234,16 +234,14 @@ emp_act var/armor = run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened hit to your [hit_area].", armour_penetration = I.armour_penetration) var/weapon_sharp = is_sharp(I) - var/weapon_edge = has_edge(I) - if((weapon_sharp || weapon_edge) && prob(getarmor(user.zone_sel.selecting, "melee"))) + if(weapon_sharp && prob(getarmor(user.zone_sel.selecting, "melee"))) weapon_sharp = 0 - weapon_edge = 0 if(armor >= 100) return 0 if(!I.force) return 0 var/Iforce = I.force //to avoid runtimes on the forcesay checks at the bottom. Some items might delete themselves if you drop them. (stunning yourself, ninja swords) - apply_damage(I.force, I.damtype, affecting, armor, sharp=weapon_sharp, edge=weapon_edge, used_weapon=I) + apply_damage(I.force, I.damtype, affecting, armor, sharp = weapon_sharp, used_weapon = I) var/bloody = 0 if(I.damtype == BRUTE && I.force && prob(25 + I.force * 2)) @@ -327,7 +325,7 @@ emp_act blocked = 1 /*else if(I) if(I.throw_speed >= EMBED_THROWSPEED_THRESHOLD) - if(!I.is_robot_module()) + if(!I.is_robot_module()) var/armor = run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened hit to your [hit_area].", I.armour_penetration) //I guess "melee" is the best fit here var/sharp = is_sharp(I) var/damage = throwpower * (I.throw_speed / 5) diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index c1d1a169c1d..9dff4bdcfef 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -519,7 +519,6 @@ var/attack_sound = "punch" var/miss_sound = 'sound/weapons/punchmiss.ogg' var/sharp = 0 - var/edge = 0 /datum/unarmed_attack/punch attack_verb = list("punch") @@ -535,7 +534,6 @@ attack_sound = 'sound/weapons/slice.ogg' miss_sound = 'sound/weapons/slashmiss.ogg' sharp = 1 - edge = 1 /datum/unarmed_attack/claws/armalis attack_verb = list("slash", "claw") diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index ffd1fb9cd60..f506a77ebc9 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -8,7 +8,7 @@ Returns standard 0 if fail */ -/mob/living/proc/apply_damage(var/damage = 0, var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/sharp = 0, var/edge = 0, var/used_weapon = null) +/mob/living/proc/apply_damage(var/damage = 0, var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/sharp = 0, var/used_weapon = null) blocked = (100-blocked)/100 if(!damage || (blocked <= 0)) return 0 switch(damagetype) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index c54060cca7e..fc9d5823602 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -41,12 +41,6 @@ /mob/living/bullet_act(var/obj/item/projectile/P, var/def_zone) //Armor var/armor = run_armor_check(def_zone, P.flag, armour_penetration = P.armour_penetration) - var/proj_sharp = is_sharp(P) - var/proj_edge = has_edge(P) - if((proj_sharp || proj_edge) && prob(getarmor(def_zone, P.flag))) - proj_sharp = 0 - proj_edge = 0 - if(!P.nodamage) apply_damage(P.damage, P.damage_type, def_zone, armor) if(P.dismemberment) @@ -78,7 +72,7 @@ if(istype(AM, /obj/item)) var/obj/item/I = AM var/zone = ran_zone("chest", 65)//Hits a random part of the body, geared towards the chest - var/dtype = BRUTE + var/dtype = BRUTE var/volume = I.get_volume_by_throwforce_and_or_w_class() if(istype(I, /obj/item/weapon)) var/obj/item/weapon/W = I @@ -97,7 +91,7 @@ visible_message("[src] has been hit by [I].", "[src] has been hit by [I].") var/armor = run_armor_check(zone, "melee", "Your armor has protected your [parse_zone(zone)].", "Your armor has softened hit to your [parse_zone(zone)].", I.armour_penetration) - apply_damage(I.throwforce, dtype, zone, armor, is_sharp(I), has_edge(I), I) + apply_damage(I.throwforce, dtype, zone, armor, is_sharp(I), I) if(I.thrownby) add_logs(I.thrownby, src, "hit", I) else diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm index 2c9ab233eda..1c514a891ca 100644 --- a/code/modules/mob/living/silicon/robot/component.dm +++ b/code/modules/mob/living/silicon/robot/component.dm @@ -34,13 +34,15 @@ installed = -1 uninstall() -/datum/robot_component/proc/take_damage(brute, electronics, sharp, edge) - if(installed != 1) return +/datum/robot_component/proc/take_damage(brute, electronics, sharp) + if(installed != 1) + return brute_damage += brute electronics_damage += electronics - if(brute_damage + electronics_damage >= max_damage) destroy() + if(brute_damage + electronics_damage >= max_damage) + destroy() /datum/robot_component/proc/heal_damage(brute, electronics) if(installed != 1) diff --git a/code/modules/mob/living/silicon/robot/robot_damage.dm b/code/modules/mob/living/silicon/robot/robot_damage.dm index 780a622906a..f84696c9964 100644 --- a/code/modules/mob/living/silicon/robot/robot_damage.dm +++ b/code/modules/mob/living/silicon/robot/robot_damage.dm @@ -98,11 +98,11 @@ var/datum/robot_component/armour/A = get_armour() if(A) - A.take_damage(brute,burn,sharp,edge) + A.take_damage(brute, burn, sharp) return var/datum/robot_component/C = pick(components) - C.take_damage(brute,burn,sharp,edge) + C.take_damage(brute, burn, sharp) /mob/living/silicon/robot/heal_overall_damage(var/brute, var/burn) var/list/datum/robot_component/parts = get_damaged_components(brute,burn) @@ -149,7 +149,7 @@ var/datum/robot_component/armour/A = get_armour() if(A) - A.take_damage(brute,burn,sharp) + A.take_damage(brute, burn, sharp) return while(parts.len && (brute>0 || burn>0) ) @@ -158,7 +158,7 @@ var/brute_was = picked.brute_damage var/burn_was = picked.electronics_damage - picked.take_damage(brute,burn) + picked.take_damage(brute, burn) brute -= (picked.brute_damage - brute_was) burn -= (picked.electronics_damage - burn_was) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index de27a2173c3..91eb0970f50 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -477,7 +477,7 @@ var/mob/living/carbon/human/H = parrot_interest var/obj/item/organ/external/affecting = H.get_organ(ran_zone(pick(parrot_dam_zone))) - H.apply_damage(damage, BRUTE, affecting, H.run_armor_check(affecting, "melee"), sharp=1) + H.apply_damage(damage, BRUTE, affecting, H.run_armor_check(affecting, "melee"), sharp = 1) custom_emote(1, pick("pecks [H]'s [affecting].", "cuts [H]'s [affecting] with its talons.")) else diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 9f5d3534215..0c16fefce1e 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -155,7 +155,6 @@ on = 0 force = initial(force) sharp = 0 - edge = 0 w_class = initial(w_class) name = initial(name) hitsound = initial(hitsound) @@ -166,7 +165,6 @@ on = 1 force = 18 sharp = 1 - edge = 1 w_class = WEIGHT_CLASS_NORMAL name = "energy dagger" hitsound = 'sound/weapons/blade1.ogg' diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm index f541ca2a94a..c7eaed9f7a8 100644 --- a/code/modules/projectiles/guns/alien.dm +++ b/code/modules/projectiles/guns/alien.dm @@ -49,8 +49,6 @@ name = "alloy spike" desc = "A broadhead spike made out of a weird silvery metal." projectile_type = /obj/item/projectile/bullet/spike - sharp = 1 - edge = 0 throwforce = 5 w_class = WEIGHT_CLASS_NORMAL caliber = "spike" diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index cde0361c810..ca8d4c1fd3d 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -144,7 +144,6 @@ attack_verb = list("attacked", "slashed", "cut", "sliced") force = 12 sharp = 1 - edge = 1 can_charge = 0 /obj/item/weapon/gun/energy/plasmacutter/examine(mob/user) diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm index 9909cb18d9d..0ae0d886be9 100644 --- a/code/modules/projectiles/guns/magic/staff.dm +++ b/code/modules/projectiles/guns/magic/staff.dm @@ -68,7 +68,7 @@ icon_state = "focus" item_state = "focus" ammo_type = list(/obj/item/ammo_casing/forcebolt) - + /obj/item/weapon/gun/magic/staff/spellblade name = "spellblade" desc = "A deadly combination of laziness and boodlust, this blade allows the user to dismember their enemies without all the hard work of actually swinging the sword." @@ -81,7 +81,6 @@ armour_penetration = 75 block_chance = 50 sharp = 1 - edge = 1 max_charges = 4 /obj/item/weapon/gun/magic/staff/spellblade/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type) diff --git a/code/modules/projectiles/guns/projectile/bow.dm b/code/modules/projectiles/guns/projectile/bow.dm index 2512ebfa35f..3fea800936e 100644 --- a/code/modules/projectiles/guns/projectile/bow.dm +++ b/code/modules/projectiles/guns/projectile/bow.dm @@ -77,7 +77,6 @@ desc = "Stab, stab, stab." icon_state = "arrow" force = 10 - sharp = 1 projectile_type = /obj/item/projectile/bullet/reusable/arrow caliber = "arrow" diff --git a/code/modules/projectiles/guns/throw/crossbow.dm b/code/modules/projectiles/guns/throw/crossbow.dm index 77d3e89eade..de90891bbd9 100644 --- a/code/modules/projectiles/guns/throw/crossbow.dm +++ b/code/modules/projectiles/guns/throw/crossbow.dm @@ -155,7 +155,6 @@ throwforce = 20 w_class = WEIGHT_CLASS_NORMAL sharp = 1 - edge = 0 /obj/item/weapon/arrow/proc/removed() //Helper for metal rods falling apart. return diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 7434038eb91..d8c8138ad56 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -5,7 +5,6 @@ damage_type = BRUTE flag = "bullet" embed = 1 - sharp = 1 hitsound_wall = "ricochet" /obj/item/projectile/bullet/weakbullet //beanbag, heavy stamina damage @@ -15,7 +14,6 @@ /obj/item/projectile/bullet/weakbullet/rubber //beanbag that shells that don't embed embed = 0 - sharp = 0 /obj/item/projectile/bullet/weakbullet/booze embed = 0 @@ -46,7 +44,6 @@ /obj/item/projectile/bullet/weakbullet2/rubber //detective's bullets that don't embed embed = 0 - sharp = 0 /obj/item/projectile/bullet/weakbullet3 damage = 20 @@ -57,7 +54,6 @@ stamina = 30 icon_state = "bullet-r" embed = 0 - sharp = 0 /obj/item/projectile/bullet/toxinbullet damage = 15 @@ -146,7 +142,6 @@ damage = 3 stamina = 25 embed = 0 - sharp = 0 icon_state = "bullet-r" /obj/item/projectile/bullet/stunshot//taser slugs for shotguns, nothing special @@ -158,7 +153,6 @@ jitter = 20 range = 7 embed = 0 - sharp = 0 icon_state = "spark" color = "#FFFF00" @@ -210,7 +204,6 @@ forcedodge = 1 nodamage = 1 embed = 0 - sharp = 0 pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE hitsound = 'sound/items/bikehorn.ogg' icon = 'icons/obj/hydroponics/harvest.dmi' @@ -245,7 +238,6 @@ icon_state = "cbbolt" damage = 6 embed = 0 - sharp = 0 var/piercing = 0 /obj/item/projectile/bullet/dart/New() @@ -308,7 +300,6 @@ damage = 0 nodamage = 1 embed = 0 - sharp = 0 /obj/item/projectile/bullet/cap/fire() loc = null diff --git a/code/modules/projectiles/projectile/reusable.dm b/code/modules/projectiles/projectile/reusable.dm index a223f415165..dbe00614d55 100644 --- a/code/modules/projectiles/projectile/reusable.dm +++ b/code/modules/projectiles/projectile/reusable.dm @@ -35,7 +35,6 @@ ammo_type = /obj/item/ammo_casing/caseless/foam_dart range = 10 var/obj/item/weapon/pen/pen = null - edge = 0 embed = 0 log_override = TRUE//it won't log even when there's a pen inside, but since the damage will be so low, I don't think there's any point in making it any more complex diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 83a4ec0650c..ef5ec2d7009 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -23,8 +23,6 @@ icon_state= "bolter" damage = 50 flag = "bullet" - sharp = 1 - edge = 1 /obj/item/projectile/bullet/gyro/on_hit(var/atom/target, var/blocked = 0) ..() diff --git a/code/modules/research/xenoarchaeology/finds/finds_misc.dm b/code/modules/research/xenoarchaeology/finds/finds_misc.dm index 0c4f8e8369d..8582575867f 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_misc.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_misc.dm @@ -6,7 +6,6 @@ throwforce = 15.0 icon_state = "plasmalarge" sharp = 1 - edge = 1 /obj/item/weapon/shard/plasma/New() diff --git a/code/modules/surgery/face.dm b/code/modules/surgery/face.dm index c17f318e748..28e0be1b046 100644 --- a/code/modules/surgery/face.dm +++ b/code/modules/surgery/face.dm @@ -106,7 +106,7 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message(" [user]'s hand slips, tearing skin on [target]'s face with \the [tool]!", \ " Your hand slips, tearing skin on [target]'s face with \the [tool]!") - target.apply_damage(10, BRUTE, affected, sharp=1, edge=1) + target.apply_damage(10, BRUTE, affected, sharp = 1) return 0 /datum/surgery_step/face/cauterize diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm index 300f6a88918..d87458e3ed9 100644 --- a/code/modules/surgery/generic.dm +++ b/code/modules/surgery/generic.dm @@ -143,7 +143,7 @@ msg = " [user]'s hand slips, damaging several organs [target]'s lower abdomen with \the [tool]" self_msg = " Your hand slips, damaging several organs [target]'s lower abdomen with \the [tool]!" user.visible_message(msg, self_msg) - target.apply_damage(12, BRUTE, affected, sharp=1) + target.apply_damage(12, BRUTE, affected, sharp = 1) return 0 /datum/surgery_step/generic/cauterize @@ -236,7 +236,7 @@ add_logs(user, target, "surgically removed [affected.name] from", addition="INTENT: [uppertext(user.a_intent)]")//log it - var/atom/movable/thing = affected.droplimb(1,DROPLIMB_EDGE) + var/atom/movable/thing = affected.droplimb(1,DROPLIMB_SHARP) if(istype(thing,/obj/item)) user.put_in_hands(thing) return 1 diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm index 667f5c02a96..8b2d2507041 100644 --- a/code/modules/surgery/limb_reattach.dm +++ b/code/modules/surgery/limb_reattach.dm @@ -126,7 +126,7 @@ var/obj/item/organ/external/E = tool user.visible_message("[user]'s hand slips, damaging [target]'s [E.amputation_point]!", \ "Your hand slips, damaging [target]'s [E.amputation_point]!") - target.apply_damage(10, BRUTE, null, sharp=1) + target.apply_damage(10, BRUTE, null, sharp = 1) return 0 @@ -213,7 +213,7 @@ var/obj/item/organ/external/E = target.get_organ(target_zone) user.visible_message("[user]'s hand slips, damaging [target]'s [E.amputation_point]!", \ "Your hand slips, damaging [target]'s [E.amputation_point]!") - target.apply_damage(10, BRUTE, null, sharp=1) + target.apply_damage(10, BRUTE, null, sharp = 1) return 0 /datum/surgery_step/limb/mechanize @@ -271,5 +271,5 @@ /datum/surgery_step/limb/mechanize/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) user.visible_message("[user]'s hand slips, damaging [target]'s flesh!", \ "Your hand slips, damaging [target]'s flesh!") - target.apply_damage(10, BRUTE, null, sharp=1) + target.apply_damage(10, BRUTE, null, sharp = 1) return 0 diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm index 4a7aa2554fc..60a475c087d 100644 --- a/code/modules/surgery/organs/augments_internal.dm +++ b/code/modules/surgery/organs/augments_internal.dm @@ -315,10 +315,10 @@ if(prob(50)) if(lasthand == "r_hand") var/obj/item/organ/external/limb = owner.get_organ("r_arm") - limb.droplimb(0, DROPLIMB_EDGE) + limb.droplimb(0, DROPLIMB_SHARP) else if(lasthand == "l_hand") var/obj/item/organ/external/limb = owner.get_organ("l_arm") - limb.droplimb(0, DROPLIMB_EDGE) + limb.droplimb(0, DROPLIMB_SHARP) owner.say("I HAVE BEEN DISARMED!!!") owner.adjustFireLoss(25)//severely injure him! overloaded = TRUE diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm index 0c45118e9a8..572a4112f06 100644 --- a/code/modules/surgery/organs/organ.dm +++ b/code/modules/surgery/organs/organ.dm @@ -233,7 +233,7 @@ var/list/organ_cache = list() W.time_inflicted = world.time //Note: external organs have their own version of this proc -/obj/item/organ/proc/take_damage(amount, var/silent=0) +/obj/item/organ/proc/take_damage(amount, silent = 0) if(tough) return if(status & ORGAN_ROBOT) diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index 7d544a61cda..28c43071b2c 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -194,7 +194,7 @@ DAMAGE PROCS ****************************************************/ -/obj/item/organ/external/take_damage(brute, burn, sharp, edge, used_weapon = null, list/forbidden_limbs = list()) +/obj/item/organ/external/take_damage(brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list()) if(tough) brute = max(0, brute - 5) burn = max(0, burn - 4) @@ -276,7 +276,7 @@ if(possible_points.len) //And pass the pain around var/obj/item/organ/external/target = pick(possible_points) - target.take_damage(brute, burn, sharp, edge, used_weapon, forbidden_limbs + src) + target.take_damage(brute, burn, sharp, used_weapon, forbidden_limbs + src) if(fail_at_full_damage == 2 && body_part != UPPER_TORSO && body_part != LOWER_TORSO) var/losstype if(burn > brute) @@ -292,8 +292,8 @@ if(owner && loc == owner) if(!cannot_amputate && config.limbs_can_break && (brute_dam) >= (max_damage * config.organ_health_multiplier)) if(prob(brute / 2)) - if(edge) - droplimb(0,DROPLIMB_EDGE) + if(sharp) + droplimb(0, DROPLIMB_SHARP) if(owner_old) owner_old.updatehealth() return update_icon() @@ -696,10 +696,10 @@ Note that amputating the affected organ does in fact remove the infection from t return if(!disintegrate) - disintegrate = DROPLIMB_EDGE + disintegrate = DROPLIMB_SHARP switch(disintegrate) - if(DROPLIMB_EDGE) + if(DROPLIMB_SHARP) if(!clean) var/gore_sound = "[(status & ORGAN_ROBOT) ? "tortured metal" : "ripping tendons and flesh"]" owner.visible_message( @@ -748,7 +748,7 @@ Note that amputating the affected organ does in fact remove the infection from t victim.regenerate_icons() dir = 2 switch(disintegrate) - if(DROPLIMB_EDGE) + if(DROPLIMB_SHARP) compile_icon() add_blood(victim) var/matrix/M = matrix() diff --git a/code/modules/surgery/organs/subtypes/standard.dm b/code/modules/surgery/organs/subtypes/standard.dm index f11d123ea75..d3a76fab60c 100644 --- a/code/modules/surgery/organs/subtypes/standard.dm +++ b/code/modules/surgery/organs/subtypes/standard.dm @@ -219,8 +219,8 @@ ..() -/obj/item/organ/external/head/take_damage(brute, burn, sharp, edge, used_weapon = null, list/forbidden_limbs = list()) - ..(brute, burn, sharp, edge, used_weapon, forbidden_limbs) +/obj/item/organ/external/head/take_damage(brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list()) + ..(brute, burn, sharp, used_weapon, forbidden_limbs) if(!disfigured) if(brute_dam > 40) if(prob(50)) diff --git a/code/modules/surgery/organs/wound.dm b/code/modules/surgery/organs/wound.dm index ca5b25dee12..b1f99b34d6b 100644 --- a/code/modules/surgery/organs/wound.dm +++ b/code/modules/surgery/organs/wound.dm @@ -318,15 +318,15 @@ datum/wound/cut/massive /datum/wound/lost_limb/New(var/obj/item/organ/external/lost_limb, var/losstype, var/clean) var/damage_amt = lost_limb.max_damage if(clean) damage_amt /= 2 - + switch(losstype) - if(DROPLIMB_EDGE, DROPLIMB_BLUNT) + if(DROPLIMB_SHARP, DROPLIMB_BLUNT) damage_type = CUT max_bleeding_stage = 3 //clotted stump and above can bleed. stages = list( "ripped stump" = damage_amt*1.3, - "bloody stump" = damage_amt, - "clotted stump" = damage_amt*0.5, + "bloody stump" = damage_amt, + "clotted stump" = damage_amt*0.5, "scarred stump" = 0 ) if(DROPLIMB_BURN) @@ -337,7 +337,7 @@ datum/wound/cut/massive "scarred stump" = damage_amt*0.5, "scarred stump" = 0 ) - + ..(damage_amt) /datum/wound/lost_limb/can_merge(var/datum/wound/other) diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index e1dc252412d..e2f2b6cb0d9 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -538,7 +538,7 @@ add_logs(user, target, "surgically removed [affected.name] from", addition="INTENT: [uppertext(user.a_intent)]")//log it - var/atom/movable/thing = affected.droplimb(1,DROPLIMB_EDGE) + var/atom/movable/thing = affected.droplimb(1,DROPLIMB_SHARP) if(istype(thing,/obj/item)) user.put_in_hands(thing) diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 37e1aebe089..b8637c3f797 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -43,7 +43,6 @@ flags = CONDUCT force = 15.0 sharp = 1 - edge = 1 w_class = WEIGHT_CLASS_NORMAL origin_tech = "materials=1;biotech=1" attack_verb = list("drilled") @@ -63,7 +62,6 @@ flags = CONDUCT force = 10.0 sharp = 1 - edge = 1 w_class = WEIGHT_CLASS_TINY throwforce = 5.0 throw_speed = 3 @@ -123,7 +121,6 @@ flags = CONDUCT force = 15.0 sharp = 1 - edge = 1 w_class = WEIGHT_CLASS_NORMAL throwforce = 9.0 throw_speed = 3