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

Unapologetic Noobkiller Nerfs (#7003)

Browse Source
This commit is contained in:
OneOneThreeEight
2019-09-24 05:18:02 -04:00
committed by Werner
parent 506abfb5db
commit 617ea81020
3 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/_onclick/item_attack.dm
View File

@@ -1,20 +1,14 @@
/*
=== Item Click Call Sequences ===
These are the default click code call sequences used when clicking on stuff with an item.
Atoms:
mob/ClickOn() calls the item's resolve_attackby() proc.
item/resolve_attackby() calls the target atom's attackby() proc.
Mobs:
mob/living/attackby() after checking for surgery, calls the item's attack() proc.
item/attack() generates attack logs, sets click cooldown and calls the mob's attacked_with_item() proc. If you override this, consider whether you need to set a click cooldown, play attack animations, and generate logs yourself.
mob/attacked_with_item() should then do mob-type specific stuff (like determining hit/miss, handling shields, etc) and then possibly call the item's apply_hit_effect() proc to actually apply the effects of being hit.
Item Hit Effects:
item/apply_hit_effect() can be overriden to do whatever you want. However "standard" physical damage based weapons should make use of the target mob's hit_with_weapon() proc to
avoid code duplication. This includes items that may sometimes act as a standard weapon in addition to having other effects (e.g. stunbatons on harm intent).
*/
@@ -93,10 +87,6 @@ avoid code duplication. This includes items that may sometimes act as a standard
power *= 2
if(ishuman(user))
var/mob/living/carbon/human/X = user
if(X.gloves && istype(X.gloves,/obj/item/clothing/gloves/force))
var/obj/item/clothing/gloves/force/G = X.gloves
power *= G.amplification
if(ishuman(target))
if(X.martial_art && X.martial_art.weapon_affinity && istype(src, X.martial_art.weapon_affinity))
perform_technique(target, X, hit_zone)
@@ -104,4 +94,4 @@ avoid code duplication. This includes items that may sometimes act as a standard
return target.hit_with_weapon(src, user, power, hit_zone)
/obj/item/proc/perform_technique(var/mob/living/carbon/human/target, var/mob/living/carbon/human/user, var/target_zone) //used when weapons have special interactions with martial arts
return
return

2
code/datums/uplink/highly visible and dangerous weapons.dm
View File

@@ -16,7 +16,7 @@
/datum/uplink_item/item/visible_weapons/forcegloves
name = "Force Gloves"
item_cost = 8
item_cost = 5
path = /obj/item/clothing/gloves/force/syndicate
/datum/uplink_item/item/visible_weapons/energy_sword