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

Various Melee Tweaks (#18497)

Browse Source 
* blatant melee buffs

* esword tweaking
This commit is contained in:
RustingWithYou
2024-02-26 23:35:39 +00:00
committed by GitHub
parent 402047bee3
commit 1dabbfb301
4 changed files with 82 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/melee/energy.dm
+33 -2
View File
@@ -242,8 +242,11 @@
origin_tech = list(TECH_MAGNET = 3, TECH_ILLEGAL = 4)
sharp = 1
edge = TRUE
var/blade_color
shield_power = 75
can_block_bullets = TRUE
base_reflectchance = 30
base_block_chance = 30
var/blade_color
/obj/item/melee/energy/sword/New()
blade_color = pick("red","blue","green","purple")
@@ -274,13 +277,41 @@
attack_verb = list()
icon_state = initial(icon_state)
/obj/item/melee/energy/sword/perform_technique(mob/living/carbon/human/target, mob/living/carbon/human/user, target_zone)
. = ..()
var/armor_reduction = target.get_blocked_ratio(target_zone, DAMAGE_BRUTE, DAMAGE_FLAG_EDGE|DAMAGE_FLAG_SHARP, damage = force)*100
var/obj/item/organ/external/affecting = target.get_organ(target_zone)
if(!affecting)
return
user.do_attack_animation(target)
if(target_zone == BP_HEAD || target_zone == BP_EYES || target_zone == BP_MOUTH)
if(prob(70 - armor_reduction))
target.eye_blurry += 5
target.confused += 10
return TRUE
if(target_zone == BP_R_ARM || target_zone == BP_L_ARM || target_zone == BP_R_HAND || target_zone == BP_L_HAND)
if(prob(80 - armor_reduction))
if(target_zone == BP_R_ARM || target_zone == BP_R_HAND)
target.drop_r_hand()
else
target.drop_l_hand()
return TRUE
if(target_zone == BP_R_FOOT || target_zone == BP_R_FOOT || target_zone == BP_R_LEG || target_zone == BP_L_LEG)
if(prob(60 - armor_reduction))
target.Weaken(5)
return TRUE
return FALSE
/obj/item/melee/energy/sword/pirate
name = "energy cutlass"
desc = "Arrrr matey."
icon_state = "cutlass0"
slot_flags = SLOT_BELT
base_reflectchance = 60
base_block_chance = 60
code/game/objects/items/weapons/shields.dm
+5 -1
View File
@@ -251,11 +251,12 @@
name = "hegemony barrier"
desc = "A Zkrehk-Guild manufactured energy shield capable of protecting the wielder from both material and energy attack."
icon_state = "hegemony-eshield0"
base_block_chance = 60
/obj/item/shield/energy/hegemony/update_icon()
icon_state = "hegemony-eshield[active]"
if(active)
set_light(1.5, 1.5, "e68917")
set_light(1.5, 1.5, "#e68917")
else
set_light(0)
@@ -263,6 +264,7 @@
name = "kataphract barrier"
desc = "A hardlight kite shield capable of protecting the wielder from both material and energy attack."
icon_state = "kataphract-eshield0"
base_block_chance = 65
/obj/item/shield/energy/hegemony/kataphract/update_icon()
icon_state = "kataphract-eshield[active]"
@@ -275,6 +277,7 @@
name = "energy barrier"
desc = "A large deployable energy shield meant to provide excellent protection against ranged attacks."
icon_state = "ebarrier0"
base_block_chance = 55
/obj/item/shield/energy/legion/update_icon()
icon_state = "ebarrier[active]"
@@ -287,6 +290,7 @@
name = "dominian energy barrier"
desc = "A hardlight energy shield meant to provide excellent protection in melee engagements."
icon_state = "dominian-eshield0"
base_block_chance = 60
/obj/item/shield/energy/dominia/update_icon()
icon_state = "dominian-eshield[active]"