cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 03:55:11 +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 15:18:21 +01:00
committed by GitHub
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/game/objects/structures/aliens.dm
+7 -7
View File
@@ -109,8 +109,8 @@
smoothing_groups = list(SMOOTH_GROUP_ALIEN_RESIN, SMOOTH_GROUP_ALIEN_WALLS)
canSmoothWith = list(SMOOTH_GROUP_ALIEN_WALLS)
/obj/structure/alien/resin/attack_paw(mob/user)
return attack_hand(user)
/obj/structure/alien/resin/attack_paw(mob/user, list/modifiers)
return attack_hand(user, modifiers)
///Used in the big derelict ruin exclusively.
/obj/structure/alien/resin/membrane/creature
@@ -299,13 +299,13 @@
if(BURST)
icon_state = "[base_icon]_hatched"
/obj/structure/alien/egg/attack_paw(mob/living/user)
return attack_hand(user)
/obj/structure/alien/egg/attack_paw(mob/living/user, list/modifiers)
return attack_hand(user, modifiers)
/obj/structure/alien/egg/attack_alien(mob/living/carbon/alien/user)
return attack_hand(user)
/obj/structure/alien/egg/attack_alien(mob/living/carbon/alien/user, list/modifiers)
return attack_hand(user, modifiers)
/obj/structure/alien/egg/attack_hand(mob/living/user)
/obj/structure/alien/egg/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
code/game/objects/structures/barsigns.dm
+1 -1
View File
@@ -61,7 +61,7 @@
/obj/structure/sign/barsign/attack_ai(mob/user)
return attack_hand(user)
/obj/structure/sign/barsign/attack_hand(mob/user)
/obj/structure/sign/barsign/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
code/game/objects/structures/beds_chairs/alien_nest.dm
+2 -2
View File
@@ -83,8 +83,8 @@
if(BURN)
playsound(loc, 'sound/items/welder.ogg', 100, TRUE)
/obj/structure/bed/nest/attack_alien(mob/living/carbon/alien/user)
/obj/structure/bed/nest/attack_alien(mob/living/carbon/alien/user, list/modifiers)
if(!user.combat_mode)
return attack_hand(user)
return attack_hand(user, modifiers)
else
return ..()
code/game/objects/structures/beds_chairs/bed.dm
+2 -2
View File
@@ -33,8 +33,8 @@
new buildstacktype(loc,buildstackamount)
..()
/obj/structure/bed/attack_paw(mob/user)
return attack_hand(user)
/obj/structure/bed/attack_paw(mob/user, list/modifiers)
return attack_hand(user, modifiers)
/obj/structure/bed/attackby(obj/item/W, mob/user, params)
if(W.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1))
code/game/objects/structures/beds_chairs/chair.dm
+2 -2
View File
@@ -66,8 +66,8 @@
new M.sheet_type(loc, FLOOR(custom_materials[M] / MINERAL_MATERIAL_AMOUNT, 1))
..()
/obj/structure/chair/attack_paw(mob/user)
return attack_hand(user)
/obj/structure/chair/attack_paw(mob/user, list/modifiers)
return attack_hand(user, modifiers)
/obj/structure/chair/narsie_act()
var/obj/structure/chair/wood/W = new/obj/structure/chair/wood(get_turf(src))
code/game/objects/structures/bedsheet_bin.dm
+3 -3
View File
@@ -363,10 +363,10 @@ LINEN BINS
to_chat(user, "<span class='notice'>You hide [I] among the sheets.</span>")
/obj/structure/bedsheetbin/attack_paw(mob/user)
return attack_hand(user)
/obj/structure/bedsheetbin/attack_paw(mob/user, list/modifiers)
return attack_hand(user, modifiers)
/obj/structure/bedsheetbin/attack_hand(mob/user)
/obj/structure/bedsheetbin/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
code/game/objects/structures/crates_lockers/closets.dm
+3 -3
View File
@@ -368,7 +368,7 @@
container_resist_act(user)
/obj/structure/closet/attack_hand(mob/living/user)
/obj/structure/closet/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
@@ -379,8 +379,8 @@
togglelock(user)
/obj/structure/closet/attack_paw(mob/user)
return attack_hand(user)
/obj/structure/closet/attack_paw(mob/user, list/modifiers)
return attack_hand(user, modifiers)
/obj/structure/closet/attack_robot(mob/user)
if(user.Adjacent(src))
code/game/objects/structures/crates_lockers/crates.dm
+1 -1
View File
@@ -45,7 +45,7 @@
if(manifest)
. += "manifest"
/obj/structure/closet/crate/attack_hand(mob/user)
/obj/structure/closet/crate/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
code/game/objects/structures/crates_lockers/crates/large.dm
+1 -1
View File
@@ -15,7 +15,7 @@
// Stops people from "diving into" a crate you can't open normally
divable = FALSE
/obj/structure/closet/crate/large/attack_hand(mob/user)
/obj/structure/closet/crate/large/attack_hand(mob/user, list/modifiers)
add_fingerprint(user)
if(manifest)
tear_manifest(user)
code/game/objects/structures/displaycase.dm
+3 -3
View File
@@ -174,10 +174,10 @@
open = !open
update_icon()
/obj/structure/displaycase/attack_paw(mob/user)
return attack_hand(user)
/obj/structure/displaycase/attack_paw(mob/user, list/modifiers)
return attack_hand(user, modifiers)
/obj/structure/displaycase/attack_hand(mob/living/user)
/obj/structure/displaycase/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
code/game/objects/structures/divine.dm
+1 -1
View File
@@ -30,7 +30,7 @@
var/time_between_uses = 1800
var/last_process = 0
/obj/structure/healingfountain/attack_hand(mob/living/user)
/obj/structure/healingfountain/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
code/game/objects/structures/dresser.dm
+1 -1
View File
@@ -20,7 +20,7 @@
new /obj/item/stack/sheet/mineral/wood(drop_location(), 10)
qdel(src)
/obj/structure/dresser/attack_hand(mob/user)
/obj/structure/dresser/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
code/game/objects/structures/extinguisher.dm
+3 -3
View File
@@ -75,7 +75,7 @@
return ..()
/obj/structure/extinguisher_cabinet/attack_hand(mob/user)
/obj/structure/extinguisher_cabinet/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
@@ -106,8 +106,8 @@
toggle_cabinet(user)
/obj/structure/extinguisher_cabinet/attack_paw(mob/user)
return attack_hand(user)
/obj/structure/extinguisher_cabinet/attack_paw(mob/user, list/modifiers)
return attack_hand(user, modifiers)
/obj/structure/extinguisher_cabinet/AltClick(mob/living/user)
if(!user.canUseTopic(src, BE_CLOSE, NO_DEXTERITY, FALSE, TRUE))
code/game/objects/structures/false_walls.dm
+2 -2
View File
@@ -31,7 +31,7 @@
. = ..()
air_update_turf(TRUE, TRUE)
/obj/structure/falsewall/attack_hand(mob/user)
/obj/structure/falsewall/attack_hand(mob/user, list/modifiers)
if(opening)
return
. = ..()
@@ -173,7 +173,7 @@
radiate()
return ..()
/obj/structure/falsewall/uranium/attack_hand(mob/user)
/obj/structure/falsewall/uranium/attack_hand(mob/user, list/modifiers)
radiate()
. = ..()
code/game/objects/structures/fence.dm
+1 -1
View File
@@ -121,7 +121,7 @@
open = TRUE
density = TRUE
/obj/structure/fence/door/attack_hand(mob/user)
/obj/structure/fence/door/attack_hand(mob/user, list/modifiers)
if(can_open(user))
toggle(user)
code/game/objects/structures/fireaxe.dm
+3 -3
View File
@@ -104,7 +104,7 @@
fireaxe = null
qdel(src)
/obj/structure/fireaxecabinet/attack_hand(mob/user)
/obj/structure/fireaxecabinet/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
@@ -124,8 +124,8 @@
update_icon()
return
/obj/structure/fireaxecabinet/attack_paw(mob/living/user)
return attack_hand(user)
/obj/structure/fireaxecabinet/attack_paw(mob/living/user, list/modifiers)
return attack_hand(user, modifiers)
/obj/structure/fireaxecabinet/attack_ai(mob/user)
toggle_lock(user)
code/game/objects/structures/flora.dm
+1 -1
View File
@@ -70,7 +70,7 @@
if(!took_presents)
took_presents = list()
/obj/structure/flora/tree/pine/xmas/presents/attack_hand(mob/living/user)
/obj/structure/flora/tree/pine/xmas/presents/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
code/game/objects/structures/fluff.dm
+1 -1
View File
@@ -103,7 +103,7 @@
desc = "Space Jesus is my copilot."
icon_state = "driverseat"
/obj/structure/fluff/bus/passable/seat/driver/attack_hand(mob/user)
/obj/structure/fluff/bus/passable/seat/driver/attack_hand(mob/user, list/modifiers)
playsound(src, 'sound/items/carhorn.ogg', 50, TRUE)
. = ..()
code/game/objects/structures/ghost_role_spawners.dm
+2 -2
View File
@@ -237,7 +237,7 @@
else
new_spawn.mind.assigned_role = "Free Golem"
/obj/effect/mob_spawn/human/golem/attack_hand(mob/user)
/obj/effect/mob_spawn/human/golem/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
@@ -843,7 +843,7 @@
outfit = /datum/outfit/spacebartender
assignedrole = "Space Bar Patron"
/obj/effect/mob_spawn/human/alive/space_bar_patron/attack_hand(mob/user)
/obj/effect/mob_spawn/human/alive/space_bar_patron/attack_hand(mob/user, list/modifiers)
var/despawn = alert("Return to cryosleep? (Warning, Your mob will be deleted!)", null, "Yes", "No")
if(despawn == "No" || !loc || !Adjacent(user))
return
code/game/objects/structures/grille.dm
+5 -5
View File
@@ -87,15 +87,15 @@
var/mob/M = AM
shock(M, 70)
/obj/structure/grille/attack_animal(mob/user)
/obj/structure/grille/attack_animal(mob/user, list/modifiers)
. = ..()
if(!.)
return
if(!shock(user, 70) && !QDELETED(src)) //Last hit still shocks but shouldn't deal damage to the grille
take_damage(rand(5,10), BRUTE, MELEE, 1)
/obj/structure/grille/attack_paw(mob/user)
return attack_hand(user)
/obj/structure/grille/attack_paw(mob/user, list/modifiers)
return attack_hand(user, modifiers)
/obj/structure/grille/hulk_damage()
return 60
@@ -105,7 +105,7 @@
return
. = ..()
/obj/structure/grille/attack_hand(mob/living/user)
/obj/structure/grille/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
@@ -116,7 +116,7 @@
if(!shock(user, 70))
take_damage(rand(5,10), BRUTE, MELEE, 1)
/obj/structure/grille/attack_alien(mob/living/user)
/obj/structure/grille/attack_alien(mob/living/user, list/modifiers)
user.do_attack_animation(src)
user.changeNext_move(CLICK_CD_MELEE)
user.visible_message("<span class='warning'>[user] mangles [src].</span>", null, null, COMBAT_MESSAGE_RANGE)
code/game/objects/structures/guillotine.dm
+1 -1
View File
@@ -66,7 +66,7 @@
if (LAZYLEN(buckled_mobs))
. += "Someone appears to be strapped in. You can help them out, or you can harm them by activating the guillotine."
/obj/structure/guillotine/attack_hand(mob/living/user)
/obj/structure/guillotine/attack_hand(mob/living/user, list/modifiers)
add_fingerprint(user)
// Currently being used by something
code/game/objects/structures/guncase.dm
+1 -1
View File
@@ -53,7 +53,7 @@
else
return ..()
/obj/structure/guncase/attack_hand(mob/user)
/obj/structure/guncase/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
code/game/objects/structures/headpike.dm
+1 -1
View File
@@ -67,7 +67,7 @@
MA.pixel_x = pixel_x
. += victim
/obj/structure/headpike/attack_hand(mob/user)
/obj/structure/headpike/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
code/game/objects/structures/holosign.dm
+3 -3
View File
@@ -23,7 +23,7 @@
projector = null
return ..()
/obj/structure/holosign/attack_hand(mob/living/user)
/obj/structure/holosign/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
@@ -161,7 +161,7 @@
return FALSE
return TRUE
/obj/structure/holosign/barrier/medical/attack_hand(mob/living/user)
/obj/structure/holosign/barrier/medical/attack_hand(mob/living/user, list/modifiers)
if(CanPass(user) && !user.combat_mode)
force_allaccess = !force_allaccess
to_chat(user, "<span class='warning'>You [force_allaccess ? "deactivate" : "activate"] the biometric scanners.</span>") //warning spans because you can make the station sick!
@@ -181,7 +181,7 @@
/obj/structure/holosign/barrier/cyborg/hacked/proc/cooldown()
shockcd = FALSE
/obj/structure/holosign/barrier/cyborg/hacked/attack_hand(mob/living/user)
/obj/structure/holosign/barrier/cyborg/hacked/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
code/game/objects/structures/industrial_lift.dm
+2 -2
View File
@@ -246,7 +246,7 @@ GLOBAL_LIST_EMPTY(lifts)
return FALSE
return TRUE
/obj/structure/industrial_lift/attack_hand(mob/user)
/obj/structure/industrial_lift/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
@@ -260,7 +260,7 @@ GLOBAL_LIST_EMPTY(lifts)
if(isAdminGhostAI(user))
use(user)
/obj/structure/industrial_lift/attack_paw(mob/user)
/obj/structure/industrial_lift/attack_paw(mob/user, list/modifiers)
return use(user)
/obj/structure/industrial_lift/attackby(obj/item/W, mob/user, params)
code/game/objects/structures/janicart.dm
+1 -1
View File
@@ -93,7 +93,7 @@
else
return ..()
/obj/structure/janitorialcart/attack_hand(mob/user)
/obj/structure/janitorialcart/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
code/game/objects/structures/kitchen_spike.dm
+3 -3
View File
@@ -47,8 +47,8 @@
can_buckle = 1
max_integrity = 250
/obj/structure/kitchenspike/attack_paw(mob/user)
return attack_hand(user)
/obj/structure/kitchenspike/attack_paw(mob/user, list/modifiers)
return attack_hand(user, modifiers)
/obj/structure/kitchenspike/crowbar_act(mob/living/user, obj/item/I)
if(has_buckled_mobs())
@@ -61,7 +61,7 @@
return TRUE
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/structure/kitchenspike/attack_hand(mob/living/user)
/obj/structure/kitchenspike/attack_hand(mob/living/user, list/modifiers)
if(VIABLE_MOB_CHECK(user.pulling) && user.combat_mode && !has_buckled_mobs())
var/mob/living/L = user.pulling
if(do_mob(user, src, 120))
code/game/objects/structures/ladders.dm
+3 -3
View File
@@ -126,16 +126,16 @@
return FALSE
return TRUE
/obj/structure/ladder/attack_hand(mob/user)
/obj/structure/ladder/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
use(user)
/obj/structure/ladder/attack_paw(mob/user)
/obj/structure/ladder/attack_paw(mob/user, list/modifiers)
return use(user)
/obj/structure/ladder/attack_alien(mob/user)
/obj/structure/ladder/attack_alien(mob/user, list/modifiers)
return use(user)
/obj/structure/ladder/attack_larva(mob/user)
code/game/objects/structures/life_candle.dm
+1 -1
View File
@@ -28,7 +28,7 @@
. = ..()
AddElement(/datum/element/movetype_handler)
/obj/structure/life_candle/attack_hand(mob/user)
/obj/structure/life_candle/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
code/game/objects/structures/maintenance.dm
+1 -1
View File
@@ -53,7 +53,7 @@ at the cost of risking a vicious bite.**/
return TRUE
/obj/structure/moisture_trap/attack_hand(mob/user)
/obj/structure/moisture_trap/attack_hand(mob/user, list/modifiers)
. = ..()
if(iscyborg(user) || isalien(user))
return
code/game/objects/structures/mineral_doors.dm
+3 -3
View File
@@ -53,10 +53,10 @@
if(get_dist(user,src) <= 1) //not remotely though
return TryToSwitchState(user)
/obj/structure/mineral_door/attack_paw(mob/user)
return attack_hand(user)
/obj/structure/mineral_door/attack_paw(mob/user, list/modifiers)
return attack_hand(user, modifiers)
/obj/structure/mineral_door/attack_hand(mob/user)
/obj/structure/mineral_door/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
code/game/objects/structures/mirror.dm
+2 -2
View File
@@ -14,7 +14,7 @@
if(icon_state == "mirror_broke" && !broken)
obj_break(null, mapload)
/obj/structure/mirror/attack_hand(mob/user)
/obj/structure/mirror/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
@@ -122,7 +122,7 @@
choosable_races += initial(S.id)
..()
/obj/structure/mirror/magic/attack_hand(mob/user)
/obj/structure/mirror/magic/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
code/game/objects/structures/morgue.dm
+6 -6
View File
@@ -58,10 +58,10 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an
return
open()
/obj/structure/bodycontainer/attack_paw(mob/user)
return attack_hand(user)
/obj/structure/bodycontainer/attack_paw(mob/user, list/modifiers)
return attack_hand(user, modifiers)
/obj/structure/bodycontainer/attack_hand(mob/user)
/obj/structure/bodycontainer/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
@@ -330,10 +330,10 @@ GLOBAL_LIST_EMPTY(crematoriums)
new /obj/item/stack/sheet/iron (loc, 2)
qdel(src)
/obj/structure/tray/attack_paw(mob/user)
return attack_hand(user)
/obj/structure/tray/attack_paw(mob/user, list/modifiers)
return attack_hand(user, modifiers)
/obj/structure/tray/attack_hand(mob/user)
/obj/structure/tray/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
code/game/objects/structures/plaques/_plaques.dm
+1 -1
View File
@@ -31,7 +31,7 @@
///Custom plaque structures and items both start "unengraved", once engraved with a fountain pen their text can't be altered again.
var/engraved = FALSE
/obj/structure/plaque/attack_hand(mob/user)
/obj/structure/plaque/attack_hand(mob/user, list/modifiers)
. = ..()
if(. || user.is_blind())
return
code/game/objects/structures/signs/_signs.dm
+1 -1
View File
@@ -47,7 +47,7 @@
M.Turn(90)
transform = M
/obj/structure/sign/attack_hand(mob/user)
/obj/structure/sign/attack_hand(mob/user, list/modifiers)
. = ..()
if(. || user.is_blind())
return
code/game/objects/structures/spawner.dm
+3 -3
View File
@@ -19,10 +19,10 @@
. = ..()
AddComponent(spawner_type, mob_types, spawn_time, faction, spawn_text, max_mobs)
/obj/structure/spawner/attack_animal(mob/living/simple_animal/M)
if(faction_check(faction, M.faction, FALSE)&&!M.client)
/obj/structure/spawner/attack_animal(mob/living/simple_animal/user, list/modifiers)
if(faction_check(faction, user.faction, FALSE) && !user.client)
return
..()
return ..()
/obj/structure/spawner/syndicate
code/game/objects/structures/spirit_board.dm
+1 -1
View File
@@ -14,7 +14,7 @@
desc = "[initial(desc)] The planchette is sitting at \"[planchette]\"."
. = ..()
/obj/structure/spirit_board/attack_hand(mob/user)
/obj/structure/spirit_board/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
code/game/objects/structures/tables_racks.dm
+6 -6
View File
@@ -59,10 +59,10 @@
qdel(src)
new /obj/structure/table/wood(A)
/obj/structure/table/attack_paw(mob/user)
return attack_hand(user)
/obj/structure/table/attack_paw(mob/user, list/modifiers)
return attack_hand(user, modifiers)
/obj/structure/table/attack_hand(mob/living/user)
/obj/structure/table/attack_hand(mob/living/user, list/modifiers)
if(Adjacent(user) && user.pulling)
if(isliving(user.pulling))
var/mob/living/pushed_mob = user.pulling
@@ -641,10 +641,10 @@
if(user.transferItemToLoc(W, drop_location()))
return 1
/obj/structure/rack/attack_paw(mob/living/user)
attack_hand(user)
/obj/structure/rack/attack_paw(mob/living/user, list/modifiers)
attack_hand(user, modifiers)
/obj/structure/rack/attack_hand(mob/living/user)
/obj/structure/rack/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
code/game/objects/structures/tank_holder.dm
+3 -3
View File
@@ -60,10 +60,10 @@
after_detach_tank()
qdel(src)
/obj/structure/tank_holder/attack_paw(mob/user)
return attack_hand(user)
/obj/structure/tank_holder/attack_paw(mob/user, list/modifiers)
return attack_hand(user, modifiers)
/obj/structure/tank_holder/attack_hand(mob/user)
/obj/structure/tank_holder/attack_hand(mob/user, list/modifiers)
if(!tank)
return ..()
if(!Adjacent(user) || issilicon(user))
code/game/objects/structures/training_machine.dm
+1 -1
View File
@@ -98,7 +98,7 @@
move_speed = clamp(range_input, MIN_SPEED, MAX_SPEED)
. = TRUE
/obj/structure/training_machine/attack_hand(mob/user)
/obj/structure/training_machine/attack_hand(mob/user, list/modifiers)
ui_interact(user)
/**
code/game/objects/structures/transit_tubes/station.dm
+1 -1
View File
@@ -59,7 +59,7 @@
qdel(R)
/obj/structure/transit_tube/station/attack_hand(mob/user)
/obj/structure/transit_tube/station/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
code/game/objects/structures/watercloset.dm
+7 -7
View File
@@ -18,7 +18,7 @@
update_icon()
/obj/structure/toilet/attack_hand(mob/living/user)
/obj/structure/toilet/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
@@ -159,7 +159,7 @@
. = ..()
hiddenitem = new /obj/item/food/urinalcake
/obj/structure/urinal/attack_hand(mob/living/user)
/obj/structure/urinal/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
@@ -276,7 +276,7 @@
. = ..()
. += "<span class='notice'>[reagents.total_volume]/[reagents.maximum_volume] liquids remaining.</span>"
/obj/structure/sink/attack_hand(mob/living/user)
/obj/structure/sink/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
@@ -480,7 +480,7 @@
var/busy = FALSE //Something's being washed at the moment
var/dispensedreagent = /datum/reagent/water // for whenever plumbing happens
/obj/structure/water_source/attack_hand(mob/living/user)
/obj/structure/water_source/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
@@ -599,7 +599,7 @@
resistance_flags = UNACIDABLE
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/structure/water_source/puddle/attack_hand(mob/M)
/obj/structure/water_source/puddle/attack_hand(mob/user, list/modifiers)
icon_state = "puddle-splash"
. = ..()
icon_state = "puddle"
@@ -678,7 +678,7 @@
return TRUE
/obj/structure/curtain/attack_hand(mob/user)
/obj/structure/curtain/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
@@ -751,5 +751,5 @@
if(opaque_closed)
set_opacity(TRUE)
/obj/structure/curtain/cloth/fancy/mechanical/attack_hand(mob/user)
/obj/structure/curtain/cloth/fancy/mechanical/attack_hand(mob/user, list/modifiers)
return
code/game/objects/structures/window.dm
+4 -4
View File
@@ -138,7 +138,7 @@
return
. = ..()
/obj/structure/window/attack_hand(mob/living/user)
/obj/structure/window/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
@@ -155,8 +155,8 @@
"<span class='warning'>You bash [src]!</span>")
playsound(src, bashsound, 100, TRUE)
/obj/structure/window/attack_paw(mob/user)
return attack_hand(user)
/obj/structure/window/attack_paw(mob/user, list/modifiers)
return attack_hand(user, modifiers)
/obj/structure/window/attack_generic(mob/user, damage_amount = 0, damage_type = BRUTE, damage_flag = 0, sound_effect = 1) //used by attack_alien, attack_animal, and attack_slime
if(!can_be_reached(user))
@@ -778,7 +778,7 @@
for (var/i in 1 to rand(1,4))
. += new /obj/item/paper/natural(location)
/obj/structure/window/paperframe/attack_hand(mob/living/user)
/obj/structure/window/paperframe/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return