cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Converts many proc overrides to properly use list/modifiers, lots of other smaller things (#3433)

Browse Source 
* Converts many proc overrides to properly use list/modifiers, lots of other smaller things

* Update human_defense.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-02-17 14:18:21 +00:00
committed by GitHub
co-authored by LemonInTheDark Gandalf2k15
parent 6f01502b33
commit 43febe3145
254 changed files with 837 additions and 837 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/ballistic.dm
+1 -1
View File
@@ -401,7 +401,7 @@
postfire_empty_checks(.)
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/gun/ballistic/attack_hand(mob/user)
/obj/item/gun/ballistic/attack_hand(mob/user, list/modifiers)
if(!internal_magazine && loc == user && user.is_holding(src) && magazine)
eject_magazine(user)
return
code/modules/projectiles/guns/ballistic/automatic.dm
+1 -1
View File
@@ -296,7 +296,7 @@
update_icon()
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/gun/ballistic/automatic/l6_saw/attack_hand(mob/user)
/obj/item/gun/ballistic/automatic/l6_saw/attack_hand(mob/user, list/modifiers)
if (loc != user)
..()
return
code/modules/projectiles/guns/ballistic/laser_gatling.dm
+1 -1
View File
@@ -30,7 +30,7 @@
overheat = max(0, overheat - heat_diffusion * delta_time)
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/minigunpack/attack_hand(mob/living/carbon/user)
/obj/item/minigunpack/attack_hand(mob/living/carbon/user, list/modifiers)
if(src.loc == user)
if(!armed)
if(user.get_item_by_slot(ITEM_SLOT_BACK) == src)