cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +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/vehicles/cars/car.dm
+1 -1
View File
@@ -39,7 +39,7 @@
return TRUE
/obj/vehicle/sealed/car/attack_hand(mob/living/user)
/obj/vehicle/sealed/car/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(!(car_traits & CAN_KIDNAP))
return
code/modules/vehicles/cars/clowncar.dm
+2 -2
View File
@@ -42,8 +42,8 @@
var/mob/voreman = i
voreman.client.give_award(/datum/award/achievement/misc/round_and_full, voreman)
/obj/vehicle/sealed/car/clowncar/attack_animal(mob/living/simple_animal/M)
if((M.loc != src) || M.environment_smash & (ENVIRONMENT_SMASH_WALLS|ENVIRONMENT_SMASH_RWALLS))
/obj/vehicle/sealed/car/clowncar/attack_animal(mob/living/simple_animal/user, list/modifiers)
if((user.loc != src) || user.environment_smash & (ENVIRONMENT_SMASH_WALLS|ENVIRONMENT_SMASH_RWALLS))
return ..()
/obj/vehicle/sealed/car/clowncar/mob_exit(mob/M, silent = FALSE, randomstep = FALSE)
code/modules/vehicles/mecha/mecha_defense.dm
+5 -5
View File
@@ -51,7 +51,7 @@
if(.)
. *= booster_damage_modifier
/obj/vehicle/sealed/mecha/attack_hand(mob/living/user)
/obj/vehicle/sealed/mecha/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
@@ -61,15 +61,15 @@
user.visible_message("<span class='danger'>[user] hits [name]. Nothing happens.</span>", null, null, COMBAT_MESSAGE_RANGE)
log_message("Attack by hand/paw. Attacker - [user].", LOG_MECHA, color="red")
/obj/vehicle/sealed/mecha/attack_paw(mob/user as mob)
return attack_hand(user)
/obj/vehicle/sealed/mecha/attack_paw(mob/user, list/modifiers)
return attack_hand(user, modifiers)
/obj/vehicle/sealed/mecha/attack_alien(mob/living/user)
/obj/vehicle/sealed/mecha/attack_alien(mob/living/user, list/modifiers)
log_message("Attack by alien. Attacker - [user].", LOG_MECHA, color="red")
playsound(src.loc, 'sound/weapons/slash.ogg', 100, TRUE)
attack_generic(user, rand(user.melee_damage_lower, user.melee_damage_upper), BRUTE, MELEE, 0)
/obj/vehicle/sealed/mecha/attack_animal(mob/living/simple_animal/user)
/obj/vehicle/sealed/mecha/attack_animal(mob/living/simple_animal/user, list/modifiers)
log_message("Attack by simple animal. Attacker - [user].", LOG_MECHA, color="red")
if(!user.melee_damage_upper && !user.obj_damage)
user.emote("custom", message = "[user.friendly_verb_continuous] [src].")
code/modules/vehicles/motorized_wheelchair.dm
+1 -1
View File
@@ -57,7 +57,7 @@
. = ..()
density = FALSE
/obj/vehicle/ridden/wheelchair/motorized/attack_hand(mob/living/user)
/obj/vehicle/ridden/wheelchair/motorized/attack_hand(mob/living/user, list/modifiers)
if(!power_cell || !panel_open)
return ..()
power_cell.update_icon()
code/modules/vehicles/pimpin_ride.dm
+1 -1
View File
@@ -63,7 +63,7 @@
if(floorbuffer)
. += "cart_buffer"
/obj/vehicle/ridden/janicart/attack_hand(mob/user)
/obj/vehicle/ridden/janicart/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
code/modules/vehicles/secway.dm
+1 -1
View File
@@ -48,7 +48,7 @@
return TRUE
return ..()
/obj/vehicle/ridden/secway/attack_hand(mob/living/user)
/obj/vehicle/ridden/secway/attack_hand(mob/living/user, list/modifiers)
if(eddie_murphy) // v lol
user.visible_message("<span class='warning'>[user] begins cleaning [eddie_murphy] out of [src].</span>", "<span class='warning'>You begin cleaning [eddie_murphy] out of [src]...</span>")
if(do_after(user, 60, target = src))