cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 04:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes proc arguments

Browse Source
This commit is contained in:
Firecage
2015-07-15 23:52:35 +02:00
parent 6a0faa4ff6
commit 4688c2c969
832 changed files with 3721 additions and 3664 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/ai_core.dm
+4 -4
View File
@@ -10,7 +10,7 @@
var/obj/item/device/mmi/brain = null
/obj/structure/AIcore/attackby(obj/item/P as obj, mob/user as mob, params)
/obj/structure/AIcore/attackby(obj/item/P, mob/user, params)
switch(state)
if(0)
if(istype(P, /obj/item/weapon/wrench))
@@ -204,7 +204,7 @@
anchored = 1
state = 20//So it doesn't interact based on the above. Not really necessary.
/obj/structure/AIcore/deactivated/attackby(var/obj/item/A as obj, var/mob/user as mob, params)
/obj/structure/AIcore/deactivated/attackby(obj/item/A, mob/user, params)
if(istype(A, /obj/item/device/aicard))//Is it?
A.transfer_ai("INACTIVE","AICARD",src,user)
if(istype(A, /obj/item/weapon/wrench))
@@ -230,7 +230,7 @@ That prevents a few funky behaviors.
//The type of interaction, the player performing the operation, the AI itself, and the card object, if any.
atom/proc/transfer_ai(var/interaction, var/mob/user, var/mob/living/silicon/ai/AI, var/obj/item/device/aicard/card)
atom/proc/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card)
if(istype(card))
if(card.flush)
user << "<span class='boldannounce'>ERROR</span>: AI flush is in progress, cannot execute transfer protocol."
@@ -238,7 +238,7 @@ atom/proc/transfer_ai(var/interaction, var/mob/user, var/mob/living/silicon/ai/A
return 1
/obj/structure/AIcore/deactivated/transfer_ai(var/interaction, var/mob/user, var/mob/living/silicon/ai/AI, var/obj/item/device/aicard/card)
/obj/structure/AIcore/deactivated/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card)
if(!..())
return
//Transferring a carded AI to a core.
code/game/objects/structures/artstuff.dm
+3 -3
View File
@@ -15,7 +15,7 @@
//Adding canvases
/obj/structure/easel/attackby(var/obj/item/I, var/mob/user, params)
/obj/structure/easel/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/canvas))
var/obj/item/weapon/canvas/C = I
user.unEquip(C)
@@ -81,7 +81,7 @@ var/global/list/globalBlankCanvases[AMT_OF_CANVASES]
//One pixel increments
/obj/item/weapon/canvas/attackby(var/obj/item/I, var/mob/user, params)
/obj/item/weapon/canvas/attackby(obj/item/I, mob/user, params)
//Click info
var/list/click_params = params2list(params)
var/pixX = text2num(click_params["icon-x"])
@@ -116,7 +116,7 @@ var/global/list/globalBlankCanvases[AMT_OF_CANVASES]
..()
//Clean the whole canvas
/obj/item/weapon/canvas/attack_self(var/mob/user)
/obj/item/weapon/canvas/attack_self(mob/user)
if(!user)
return
var/icon/blank = getGlobalBackup()
code/game/objects/structures/barsigns.dm
+4 -4
View File
@@ -31,7 +31,7 @@
/obj/structure/sign/barsign/proc/set_sign(var/datum/barsign/sign)
/obj/structure/sign/barsign/proc/set_sign(datum/barsign/sign)
if(!istype(sign))
return
icon_state = sign.icon
@@ -43,12 +43,12 @@
/obj/structure/sign/barsign/attack_ai(mob/user as mob)
/obj/structure/sign/barsign/attack_ai(mob/user)
return src.attack_hand(user)
/obj/structure/sign/barsign/attack_hand(mob/user as mob)
/obj/structure/sign/barsign/attack_hand(mob/user)
if (!src.allowed(user))
user << "<span class='info'>Access denied.</span>"
return
@@ -60,7 +60,7 @@
/obj/structure/sign/barsign/attackby(var/obj/item/I, var/mob/user)
/obj/structure/sign/barsign/attackby(obj/item/I, mob/user)
if(!allowed(user))
user << "<span class='info'>Access denied.</span>"
return
code/game/objects/structures/bedsheet_bin.dm
+5 -5
View File
@@ -24,7 +24,7 @@ LINEN BINS
if(!attempt_initiate_surgery(src, M, user))
..()
/obj/item/weapon/bedsheet/attack_self(mob/user as mob)
/obj/item/weapon/bedsheet/attack_self(mob/user)
user.drop_item()
if(layer == initial(layer))
layer = 5
@@ -205,7 +205,7 @@ LINEN BINS
update_icon()
return
/obj/structure/bedsheetbin/attackby(obj/item/I as obj, mob/user as mob, params)
/obj/structure/bedsheetbin/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/bedsheet))
if(!user.drop_item())
return
@@ -224,11 +224,11 @@ LINEN BINS
/obj/structure/bedsheetbin/attack_paw(mob/user as mob)
/obj/structure/bedsheetbin/attack_paw(mob/user)
return attack_hand(user)
/obj/structure/bedsheetbin/attack_hand(mob/user as mob)
/obj/structure/bedsheetbin/attack_hand(mob/user)
if(user.lying)
return
if(amount >= 1)
@@ -254,7 +254,7 @@ LINEN BINS
add_fingerprint(user)
/obj/structure/bedsheetbin/attack_tk(mob/user as mob)
/obj/structure/bedsheetbin/attack_tk(mob/user)
if(amount >= 1)
amount--
code/game/objects/structures/crates_lockers/bins.dm
+4 -4
View File
@@ -25,7 +25,7 @@
else
overlays += orangelight
/obj/structure/closet/crate/bin/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/structure/closet/crate/bin/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/storage/bag/trash))
var/obj/item/weapon/storage/bag/trash/T = W
user << "<span class='notice'>You fill the bag.</span>"
@@ -43,7 +43,7 @@
else
..()
/obj/structure/closet/crate/bin/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
/obj/structure/closet/crate/bin/MouseDrop_T(atom/movable/O as mob|obj, mob/user)
. = ..(O, user, 0, 0, 0)
if(.)
if(O != user)
@@ -76,12 +76,12 @@
playsound(src.loc, sound_effect_close, 15, 1, -3)
update_icon()
/obj/structure/closet/crate/bin/insert(var/obj/item/I, var/include_mobs = 0, var/animate = 0)
/obj/structure/closet/crate/bin/insert(obj/item/I, include_mobs = 0, animate = 0)
. = ..(I, include_mobs)
if(animate && .)
do_animate()
/obj/structure/closet/crate/bin/place(var/mob/user, var/obj/item/I)
/obj/structure/closet/crate/bin/place(mob/user, obj/item/I)
if(contents.len >= storage_capacity)
return 1
if(!opened && user.drop_item())
code/game/objects/structures/crates_lockers/closets.dm
+13 -13
View File
@@ -111,7 +111,7 @@
update_icon()
return 1
/obj/structure/closet/proc/insert(var/atom/movable/AM)
/obj/structure/closet/proc/insert(atom/movable/AM)
if(contents.len >= storage_capacity)
return -1
@@ -165,7 +165,7 @@
qdel(src)
..()
/obj/structure/closet/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/closet/bullet_act(obj/item/projectile/Proj)
..()
if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
health -= Proj.damage
@@ -174,7 +174,7 @@
qdel(src)
return
/obj/structure/closet/attack_animal(mob/living/simple_animal/user as mob)
/obj/structure/closet/attack_animal(mob/living/simple_animal/user)
if(user.environment_smash)
user.do_attack_animation(src)
visible_message("<span class='danger'>[user] destroys \the [src].</span>")
@@ -187,7 +187,7 @@
qdel(src)
/obj/structure/closet/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/structure/closet/attackby(obj/item/weapon/W, mob/user, params)
if(user.loc == src)
return
if(opened)
@@ -241,13 +241,13 @@
if(!place(user, W) && !isnull(W))
attack_hand(user)
/obj/structure/closet/proc/place(var/mob/user, var/obj/item/I)
/obj/structure/closet/proc/place(mob/user, obj/item/I)
if(!opened && secure)
togglelock(user)
return 1
return 0
/obj/structure/closet/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob, var/needs_opened = 1, var/show_message = 1, var/move_them = 1)
/obj/structure/closet/MouseDrop_T(atom/movable/O as mob|obj, mob/user, needs_opened = 1, show_message = 1, move_them = 1)
if(istype(O, /obj/screen)) //fix for HUD elements making their way into the world -Pete
return 0
if(!isturf(O.loc))
@@ -269,7 +269,7 @@
add_fingerprint(user)
return 1
/obj/structure/closet/relaymove(mob/user as mob)
/obj/structure/closet/relaymove(mob/user)
if(user.stat || !isturf(loc))
return
if(!open())
@@ -280,10 +280,10 @@
M.show_message("<FONT size=[max(0, 5 - get_dist(src, M))]>BANG, bang!</FONT>", 2)
/obj/structure/closet/attack_paw(mob/user as mob)
/obj/structure/closet/attack_paw(mob/user)
return attack_hand(user)
/obj/structure/closet/attack_hand(mob/user as mob)
/obj/structure/closet/attack_hand(mob/user)
add_fingerprint(user)
if(user.lying && get_dist(src, user) > 0)
return
@@ -293,7 +293,7 @@
return
// tk grab then use on self
/obj/structure/closet/attack_self_tk(mob/user as mob)
/obj/structure/closet/attack_self_tk(mob/user)
return attack_hand(user)
/obj/structure/closet/verb/verb_toggleopen()
@@ -350,7 +350,7 @@
else
user << "<span class='warning'>You fail to break out of [src]!</span>"
/obj/structure/closet/AltClick(var/mob/user)
/obj/structure/closet/AltClick(mob/user)
..()
if(!user.canUseTopic(user) || broken)
user << "<span class='warning'>You can't do that right now!</span>"
@@ -375,7 +375,7 @@
req_access += pick(get_all_accesses())
..()
/obj/structure/closet/proc/togglelock(mob/user as mob)
/obj/structure/closet/proc/togglelock(mob/user)
if(secure)
if(allowed(user))
locked = !locked
@@ -389,7 +389,7 @@
else
return
/obj/structure/closet/emag_act(mob/user as mob)
/obj/structure/closet/emag_act(mob/user)
if(secure && !broken)
broken = 1
locked = 0
code/game/objects/structures/crates_lockers/closets/crittercrate.dm
+1 -1
View File
@@ -30,7 +30,7 @@
locked = 1
return 1
/obj/structure/closet/critter/attack_hand(mob/user as mob)
/obj/structure/closet/critter/attack_hand(mob/user)
src.add_fingerprint(user)
if(src.loc == user.loc)
code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+1 -1
View File
@@ -34,7 +34,7 @@
new /obj/item/weapon/storage/backpack/satchel/withwallet( src )
new /obj/item/device/radio/headset( src )
/obj/structure/closet/secure_closet/personal/attackby(obj/item/W as obj, mob/user as mob, params)
/obj/structure/closet/secure_closet/personal/attackby(obj/item/W, mob/user, params)
if(istype(W))
var/obj/item/weapon/card/id/I = W.GetID()
code/game/objects/structures/crates_lockers/closets/statue.dm
+4 -4
View File
@@ -108,7 +108,7 @@
/obj/structure/closet/statue/toggle()
return
/obj/structure/closet/statue/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/closet/statue/bullet_act(obj/item/projectile/Proj)
health -= Proj.damage
if(health <= 0)
for(var/mob/M in src)
@@ -116,7 +116,7 @@
return
/obj/structure/closet/statue/attack_animal(mob/living/simple_animal/user as mob)
/obj/structure/closet/statue/attack_animal(mob/living/simple_animal/user)
if(user.environment_smash)
for(var/mob/M in src)
shatter(M)
@@ -125,7 +125,7 @@
for(var/mob/M in src)
shatter(M)
/obj/structure/closet/statue/attackby(obj/item/I as obj, mob/user as mob, params)
/obj/structure/closet/statue/attackby(obj/item/I, mob/user, params)
user.changeNext_move(CLICK_CD_MELEE)
health -= I.force
visible_message("<span class='danger'>[user] strikes [src] with [I].</span>")
@@ -151,7 +151,7 @@
/obj/structure/closet/statue/update_icon()
return
/obj/structure/closet/statue/proc/shatter(mob/user as mob)
/obj/structure/closet/statue/proc/shatter(mob/user)
if (user)
user.dust()
dump_contents()
code/game/objects/structures/crates_lockers/crates.dm
+8 -8
View File
@@ -172,7 +172,7 @@
update_icon()
return 1
/obj/structure/closet/crate/insert(var/atom/movable/AM, var/include_mobs = 0)
/obj/structure/closet/crate/insert(atom/movable/AM, include_mobs = 0)
if(contents.len >= storage_capacity)
return -1
@@ -194,7 +194,7 @@
AM.loc = src
return 1
/obj/structure/closet/crate/proc/tear_manifest(mob/user as mob)
/obj/structure/closet/crate/proc/tear_manifest(mob/user)
user << "<span class='notice'>You tear the manifest off of the crate.</span>"
playsound(src.loc, 'sound/items/poster_ripped.ogg', 75, 1)
manifest.loc = loc
@@ -203,7 +203,7 @@
manifest = null
overlays-="manifest"
/obj/structure/closet/crate/attack_hand(mob/user as mob)
/obj/structure/closet/crate/attack_hand(mob/user)
if(manifest)
tear_manifest(user)
return
@@ -221,7 +221,7 @@
open()
return
/obj/structure/closet/crate/secure/attack_hand(mob/user as mob)
/obj/structure/closet/crate/secure/attack_hand(mob/user)
if(manifest)
tear_manifest(user)
return
@@ -238,7 +238,7 @@
else
..()
/obj/structure/closet/crate/secure/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/structure/closet/crate/secure/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/card) && src.allowed(user) && !locked && !opened && !broken)
user << "<span class='notice'>You lock \the [src].</span>"
src.locked = 1
@@ -248,7 +248,7 @@
return ..()
/obj/structure/closet/crate/secure/emag_act(mob/user as mob)
/obj/structure/closet/crate/secure/emag_act(mob/user)
if(locked && !broken)
src.locked = 0
src.broken = 1
@@ -259,10 +259,10 @@
user << "<span class='notice'>You unlock \the [src].</span>"
add_fingerprint(user)
/obj/structure/closet/crate/attack_paw(mob/user as mob)
/obj/structure/closet/crate/attack_paw(mob/user)
return attack_hand(user)
/obj/structure/closet/crate/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/structure/closet/crate/attackby(obj/item/weapon/W, mob/user, params)
if(opened)
if(isrobot(user))
return
code/game/objects/structures/crates_lockers/largecrate.dm
+2 -2
View File
@@ -16,7 +16,7 @@
if(manifest)
overlays += "manifest"
/obj/structure/largecrate/attack_hand(mob/user as mob)
/obj/structure/largecrate/attack_hand(mob/user)
if(manifest)
user << "<span class='notice'>You tear the manifest off of the crate.</span>"
playsound(src.loc, 'sound/items/poster_ripped.ogg', 75, 1)
@@ -30,7 +30,7 @@
user << "<span class='warning'>You need a crowbar to pry this open!</span>"
return
/obj/structure/largecrate/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/structure/largecrate/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/crowbar))
if(manifest)
manifest.loc = loc
code/game/objects/structures/displaycase.dm
+4 -4
View File
@@ -28,7 +28,7 @@
src.healthcheck()
/obj/structure/displaycase/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/displaycase/bullet_act(obj/item/projectile/Proj)
if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
health -= Proj.damage
..()
@@ -71,17 +71,17 @@
return
/obj/structure/displaycase/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/structure/displaycase/attackby(obj/item/weapon/W, mob/user, params)
user.changeNext_move(CLICK_CD_MELEE)
src.health -= W.force
src.healthcheck()
..()
return
/obj/structure/displaycase/attack_paw(mob/user as mob)
/obj/structure/displaycase/attack_paw(mob/user)
return src.attack_hand(user)
/obj/structure/displaycase/attack_hand(mob/user as mob)
/obj/structure/displaycase/attack_hand(mob/user)
user.changeNext_move(CLICK_CD_MELEE)
if (src.destroyed && src.occupied)
new /obj/item/weapon/gun/energy/laser/captain( src.loc )
code/game/objects/structures/door_assembly.dm
+1 -1
View File
@@ -334,7 +334,7 @@
mineral = "glass"
icon_state = "door_as_gviro1"
/obj/structure/door_assembly/attackby(obj/item/W as obj, mob/user as mob, params)
/obj/structure/door_assembly/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/weapon/pen))
var/t = stripped_input(user, "Enter the name for the door.", src.name, src.created_name,MAX_NAME_LEN)
if(!t)
code/game/objects/structures/dresser.dm
+1 -1
View File
@@ -6,7 +6,7 @@
density = 1
anchored = 1
/obj/structure/dresser/attack_hand(mob/user as mob)
/obj/structure/dresser/attack_hand(mob/user)
if(!Adjacent(user))//no tele-grooming
return
if(ishuman(user))
code/game/objects/structures/electricchair.dm
+1 -1
View File
@@ -10,7 +10,7 @@
overlays += image('icons/obj/objects.dmi', src, "echair_over", MOB_LAYER + 1, dir)
return
/obj/structure/stool/bed/chair/e_chair/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/structure/stool/bed/chair/e_chair/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/wrench))
var/obj/structure/stool/bed/chair/C = new /obj/structure/stool/bed/chair(loc)
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
code/game/objects/structures/fireaxe.dm
+5 -5
View File
@@ -14,7 +14,7 @@
..()
update_icon()
/obj/structure/fireaxecabinet/attackby(obj/item/I as obj, mob/user as mob, params)
/obj/structure/fireaxecabinet/attackby(obj/item/I, mob/user, params)
if(isrobot(user) || istype(I,/obj/item/device/multitool))
toggle_lock(user)
return
@@ -60,7 +60,7 @@
if(3.0)
return
/obj/structure/fireaxecabinet/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/fireaxecabinet/bullet_act(obj/item/projectile/Proj)
if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
if(Proj.damage)
glass_hp -= Proj.damage
@@ -73,7 +73,7 @@
fireaxe.loc = src.loc
qdel(src)
/obj/structure/fireaxecabinet/attack_hand(mob/user as mob)
/obj/structure/fireaxecabinet/attack_hand(mob/user)
if(open || glass_hp <= 0)
if(fireaxe)
user.put_in_hands(fireaxe)
@@ -90,12 +90,12 @@
update_icon()
return
/obj/structure/fireaxecabinet/attack_paw(mob/user as mob)
/obj/structure/fireaxecabinet/attack_paw(mob/user)
if(ismonkey(user)) //no fire-axe wielding aliens allowed
attack_hand(user)
return
/obj/structure/fireaxecabinet/attack_ai(mob/user as mob)
/obj/structure/fireaxecabinet/attack_ai(mob/user)
toggle_lock(user)
return
code/game/objects/structures/girders.dm
+2 -2
View File
@@ -13,7 +13,7 @@
var/state = GIRDER_NORMAL
var/girderpasschance = 20 // percentage chance that a projectile passes through the girder.
/obj/structure/girder/attackby(obj/item/W as obj, mob/user as mob, params)
/obj/structure/girder/attackby(obj/item/W, mob/user, params)
add_fingerprint(user)
if(istype(W, /obj/item/weapon/screwdriver) && state == GIRDER_DISPLACED)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
@@ -284,7 +284,7 @@
density = 1
layer = 2
/obj/structure/cultgirder/attackby(obj/item/W as obj, mob/user as mob, params)
/obj/structure/cultgirder/attackby(obj/item/W, mob/user, params)
add_fingerprint(user)
if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
code/game/objects/structures/grille.dm
+8 -8
View File
@@ -26,7 +26,7 @@
if(ismob(user)) shock(user, 70)
/obj/structure/grille/attack_paw(mob/user as mob)
/obj/structure/grille/attack_paw(mob/user)
attack_hand(user)
/obj/structure/grille/attack_hulk(mob/living/carbon/human/user)
@@ -35,7 +35,7 @@
health -= 5
healthcheck()
/obj/structure/grille/attack_hand(mob/living/user as mob)
/obj/structure/grille/attack_hand(mob/living/user)
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src)
playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
@@ -49,7 +49,7 @@
health -= rand(1,2)
healthcheck()
/obj/structure/grille/attack_alien(mob/living/user as mob)
/obj/structure/grille/attack_alien(mob/living/user)
user.do_attack_animation(src)
if(istype(user, /mob/living/carbon/alien/larva)) return
user.changeNext_move(CLICK_CD_MELEE)
@@ -63,7 +63,7 @@
healthcheck()
return
/obj/structure/grille/attack_slime(mob/living/simple_animal/slime/user as mob)
/obj/structure/grille/attack_slime(mob/living/simple_animal/slime/user)
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src)
if(!user.is_adult) return
@@ -77,7 +77,7 @@
healthcheck()
return
/obj/structure/grille/attack_animal(var/mob/living/simple_animal/M as mob)
/obj/structure/grille/attack_animal(var/mob/living/simple_animal/M)
M.changeNext_move(CLICK_CD_MELEE)
if(M.melee_damage_upper == 0) return
M.do_attack_animation(src)
@@ -133,7 +133,7 @@
var/obj/item/stack/rods/newrods = new(loc)
transfer_fingerprints_to(newrods)
/obj/structure/grille/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/structure/grille/attackby(obj/item/weapon/W, mob/user, params)
user.changeNext_move(CLICK_CD_MELEE)
add_fingerprint(user)
if(istype(W, /obj/item/weapon/wirecutters))
@@ -225,7 +225,7 @@
// shock user with probability prb (if all connections & power are working)
// returns 1 if shocked, 0 otherwise
/obj/structure/grille/proc/shock(mob/user as mob, prb)
/obj/structure/grille/proc/shock(mob/user, prb)
if(!anchored || destroyed) // anchored/destroyed grilles are never connected
return 0
if(!prob(prb))
@@ -264,4 +264,4 @@
healthcheck()
/obj/structure/grille/storage_contents_dump_act(obj/item/weapon/storage/src_object, mob/user)
return 0
return 0
code/game/objects/structures/janicart.dm
+1 -1
View File
@@ -301,7 +301,7 @@
buckled_mob.pixel_y = 7
/obj/structure/stool/bed/chair/janicart/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/stool/bed/chair/janicart/bullet_act(obj/item/projectile/Proj)
if(buckled_mob)
buckled_mob.bullet_act(Proj)
code/game/objects/structures/kitchen_spike.dm
+3 -3
View File
@@ -22,10 +22,10 @@
var/skin = 0
var/skintype = null
/obj/structure/kitchenspike/attack_paw(mob/user as mob)
/obj/structure/kitchenspike/attack_paw(mob/user)
return src.attack_hand(usr)
/obj/structure/kitchenspike/attackby(obj/item/weapon/grab/G as obj, mob/user as mob, params)
/obj/structure/kitchenspike/attackby(obj/item/weapon/grab/G, mob/user, params)
if(!istype(G, /obj/item/weapon/grab))
return
if(istype(G.affecting, /mob/living/carbon/monkey))
@@ -80,7 +80,7 @@
// else if(istype(C, /obj/mob/carbon/alien) && !istype(C, /mob/living/carbon/alien/larva/slime))
// else if(istype(C, /obj/livestock/spesscarp
/obj/structure/kitchenspike/attack_hand(mob/user as mob)
/obj/structure/kitchenspike/attack_hand(mob/user)
if(..())
return
if(src.occupied)
code/game/objects/structures/ladders.dm
+3 -3
View File
@@ -36,7 +36,7 @@
else //wtf make your ladders properly assholes
icon_state = "ladder00"
/obj/structure/ladder/attack_hand(mob/user as mob)
/obj/structure/ladder/attack_hand(mob/user)
if(up && down)
switch( alert("Go up or down the ladder?", "Ladder", "Up", "Down", "Cancel") )
if("Up")
@@ -66,8 +66,8 @@
add_fingerprint(user)
/obj/structure/ladder/attack_paw(mob/user as mob)
/obj/structure/ladder/attack_paw(mob/user)
return attack_hand(user)
/obj/structure/ladder/attackby(obj/item/weapon/W, mob/user as mob, params)
/obj/structure/ladder/attackby(obj/item/weapon/W, mob/user, params)
return attack_hand(user)
code/game/objects/structures/lamarr_cage.dm
+4 -4
View File
@@ -26,7 +26,7 @@
src.healthcheck()
/obj/structure/lamarr/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/lamarr/bullet_act(obj/item/projectile/Proj)
health -= Proj.damage
..()
src.healthcheck()
@@ -60,17 +60,17 @@
return
/obj/structure/lamarr/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/structure/lamarr/attackby(obj/item/weapon/W, mob/user, params)
user.changeNext_move(CLICK_CD_MELEE)
src.health -= W.force
src.healthcheck()
..()
return
/obj/structure/lamarr/attack_paw(mob/user as mob)
/obj/structure/lamarr/attack_paw(mob/user)
return src.attack_hand(user)
/obj/structure/lamarr/attack_hand(mob/user as mob)
/obj/structure/lamarr/attack_hand(mob/user)
user.changeNext_move(CLICK_CD_MELEE)
if (src.destroyed)
return
code/game/objects/structures/lattice.dm
+2 -2
View File
@@ -50,7 +50,7 @@
else
return
/obj/structure/lattice/attackby(obj/item/C as obj, mob/user as mob, params)
/obj/structure/lattice/attackby(obj/item/C, mob/user, params)
var/turf/T = get_turf(src)
if (istype(C, /obj/item/stack/tile/plasteel))
T.attackby(C, user) //BubbleWrap - hand this off to the underlying turf instead (for building plating)
@@ -107,7 +107,7 @@
C.Deconstruct()
..()
/obj/structure/lattice/catwalk/attackby(obj/item/C as obj, mob/user as mob, params)
/obj/structure/lattice/catwalk/attackby(obj/item/C, mob/user, params)
..()
if(istype(C, /obj/item/stack/cable_coil))
var/turf/T = get_turf(src)
code/game/objects/structures/mirror.dm
+7 -7
View File
@@ -9,7 +9,7 @@
var/shattered = 0
/obj/structure/mirror/attack_hand(mob/user as mob)
/obj/structure/mirror/attack_hand(mob/user)
if(shattered) return
if(ishuman(user))
@@ -46,7 +46,7 @@
desc = "Oh no, seven years of bad luck!"
/obj/structure/mirror/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/mirror/bullet_act(obj/item/projectile/Proj)
if(prob(Proj.damage * 2))
if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
if(!shattered)
@@ -56,7 +56,7 @@
..()
/obj/structure/mirror/attackby(obj/item/I as obj, mob/living/user as mob, params)
/obj/structure/mirror/attackby(obj/item/I, mob/living/user, params)
user.do_attack_animation(src)
if(I.damtype == STAMINA)
return
@@ -72,7 +72,7 @@
playsound(src.loc, 'sound/effects/Glasshit.ogg', 70, 1)
/obj/structure/mirror/attack_alien(mob/living/user as mob)
/obj/structure/mirror/attack_alien(mob/living/user)
user.do_attack_animation(src)
if(islarva(user)) return
if(shattered)
@@ -82,7 +82,7 @@
shatter()
/obj/structure/mirror/attack_animal(mob/living/user as mob)
/obj/structure/mirror/attack_animal(mob/living/user)
if(!isanimal(user)) return
var/mob/living/simple_animal/M = user
if(M.melee_damage_upper <= 0) return
@@ -94,7 +94,7 @@
shatter()
/obj/structure/mirror/attack_slime(mob/living/user as mob)
/obj/structure/mirror/attack_slime(mob/living/user)
user.do_attack_animation(src)
if(shattered)
playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
@@ -123,7 +123,7 @@
choosable_races += S.id
..()
/obj/structure/mirror/magic/attack_hand(mob/user as mob)
/obj/structure/mirror/magic/attack_hand(mob/user)
if(!ishuman(user))
return
code/game/objects/structures/morgue.dm
+9 -9
View File
@@ -41,10 +41,10 @@
/obj/structure/bodycontainer/alter_health()
return src.loc
/obj/structure/bodycontainer/attack_paw(mob/user as mob)
/obj/structure/bodycontainer/attack_paw(mob/user)
return src.attack_hand(user)
/obj/structure/bodycontainer/attack_hand(mob/user as mob)
/obj/structure/bodycontainer/attack_hand(mob/user)
if(locked)
user << "<span class='danger'>It's locked.</span>"
return
@@ -57,7 +57,7 @@
close()
add_fingerprint(user)
/obj/structure/bodycontainer/attackby(P as obj, mob/user as mob, params)
/obj/structure/bodycontainer/attackby(obj/P, mob/user, params)
if (istype(P, /obj/item/weapon/pen))
var/t = stripped_input(user, "What would you like the label to be?", text("[]", name), null)
if (user.get_active_hand() != P)
@@ -159,7 +159,7 @@ var/global/list/crematoriums = new/list()
return
/obj/structure/bodycontainer/crematorium/proc/cremate(mob/user as mob)
/obj/structure/bodycontainer/crematorium/proc/cremate(mob/user)
if(locked)
return //don't let you cremate something twice or w/e
@@ -197,7 +197,7 @@ var/global/list/crematoriums = new/list()
/*
Crematorium Switch
*/
/obj/machinery/crema_switch/attack_hand(mob/user as mob)
/obj/machinery/crema_switch/attack_hand(mob/user)
if(src.allowed(usr))
for (var/obj/structure/bodycontainer/crematorium/C in crematoriums)
if (C.id != id)
@@ -208,7 +208,7 @@ Crematorium Switch
usr << "<span class='danger'>Access denied.</span>"
return
/obj/machinery/crema_switch/attackby(obj/item/W as obj, mob/user as mob, params)
/obj/machinery/crema_switch/attackby(obj/item/W, mob/user, params)
if(W.GetID())
attack_hand(user)
else
@@ -235,17 +235,17 @@ Crematorium Switch
connected = null
..()
/obj/structure/tray/attack_paw(mob/user as mob)
/obj/structure/tray/attack_paw(mob/user)
return src.attack_hand(user)
/obj/structure/tray/attack_hand(mob/user as mob)
/obj/structure/tray/attack_hand(mob/user)
if (src.connected)
connected.close()
add_fingerprint(user)
else
user << "<span class='warning'>That's not connected to anything!</span>"
/obj/structure/tray/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
/obj/structure/tray/MouseDrop_T(atom/movable/O as mob|obj, mob/user)
if(!istype(O, /atom/movable) || O.anchored || !Adjacent(user) || !user.Adjacent(O) || O.loc == user)
return
if(!ismob(O))
code/game/objects/structures/musician.dm
+9 -9
View File
@@ -27,7 +27,7 @@
// note is a number from 1-7 for A-G
// acc is either "b", "n", or "#"
// oct is 1-8 (or 9 for C)
/datum/song/proc/playnote(var/note, var/acc as text, var/oct)
/datum/song/proc/playnote(note, acc as text, oct)
// handle accidental -> B<>C of E<>F
if(acc == "b" && (note == 3 || note == 6)) // C or F
if(note == 3)
@@ -63,7 +63,7 @@
continue
M.playsound_local(source, soundfile, 100, falloff = 5)
/datum/song/proc/updateDialog(mob/user as mob)
/datum/song/proc/updateDialog(mob/user)
instrumentObj.updateDialog() // assumes it's an object in world, override if otherwise
/datum/song/proc/shouldStopPlaying(mob/user)
@@ -74,7 +74,7 @@
else
return 1
/datum/song/proc/playsong(mob/user as mob)
/datum/song/proc/playsong(mob/user)
while(repeat >= 0)
var/cur_oct[7]
var/cur_acc[7]
@@ -119,7 +119,7 @@
repeat = 0
updateDialog(user)
/datum/song/proc/interact(mob/user as mob)
/datum/song/proc/interact(mob/user)
var/dat = ""
if(lines.len > 0)
@@ -285,7 +285,7 @@
// subclass for handheld instruments, like violin
/datum/song/handheld
/datum/song/handheld/updateDialog(mob/user as mob)
/datum/song/handheld/updateDialog(mob/user)
instrumentObj.interact(user)
/datum/song/handheld/shouldStopPlaying()
@@ -328,23 +328,23 @@
song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded
..()
/obj/structure/piano/attack_hand(mob/user as mob)
/obj/structure/piano/attack_hand(mob/user)
if(!user.IsAdvancedToolUser())
user << "<span class='warning'>You don't have the dexterity to do this!</span>"
return 1
interact(user)
/obj/structure/piano/attack_paw(mob/user as mob)
/obj/structure/piano/attack_paw(mob/user)
return src.attack_hand(user)
/obj/structure/piano/interact(mob/user as mob)
/obj/structure/piano/interact(mob/user)
if(!user || !anchored)
return
user.set_machine(src)
song.interact(user)
/obj/structure/piano/attackby(obj/item/O as obj, mob/user as mob, params)
/obj/structure/piano/attackby(obj/item/O, mob/user, params)
if (istype(O, /obj/item/weapon/wrench))
if (!anchored && !isinspace())
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
code/game/objects/structures/noticeboard.dm
+2 -2
View File
@@ -16,7 +16,7 @@
icon_state = "nboard0[notices]"
//attaching papers!!
/obj/structure/noticeboard/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob, params)
/obj/structure/noticeboard/attackby(obj/item/weapon/O, mob/user, params)
if(istype(O, /obj/item/weapon/paper))
if(notices < 5)
if(!user.drop_item())
@@ -30,7 +30,7 @@
else
user << "<span class='notice'>You reach to pin your paper to the board but hesitate. You are certain your paper will not be seen among the many others already attached.</span>"
/obj/structure/noticeboard/attack_hand(user as mob)
/obj/structure/noticeboard/attack_hand(mob/user)
var/dat = "<B>Noticeboard</B><BR>"
for(var/obj/item/weapon/paper/P in src)
dat += "<A href='?src=\ref[src];read=\ref[P]'>[P.name]</A> <A href='?src=\ref[src];write=\ref[P]'>Write</A> <A href='?src=\ref[src];remove=\ref[P]'>Remove</A><BR>"
code/game/objects/structures/safe.dm
+3 -3
View File
@@ -39,7 +39,7 @@ FLOOR SAFES
I.loc = src
/obj/structure/safe/proc/check_unlocked(mob/user as mob, canhear)
/obj/structure/safe/proc/check_unlocked(mob/user, canhear)
if(user && canhear)
if(tumbler_1_pos == tumbler_1_open)
user << "<span class='italics'>You hear a [pick("tonk", "krunk", "plunk")] from [src].</span>"
@@ -72,7 +72,7 @@ FLOOR SAFES
icon_state = initial(icon_state)
/obj/structure/safe/attack_hand(mob/user as mob)
/obj/structure/safe/attack_hand(mob/user)
user.set_machine(src)
var/dat = "<center>"
dat += "<a href='?src=\ref[src];open=1'>[open ? "Close" : "Open"] [src]</a> | <a href='?src=\ref[src];decrement=1'>-</a> [dial * 5] <a href='?src=\ref[src];increment=1'>+</a>"
@@ -142,7 +142,7 @@ FLOOR SAFES
updateUsrDialog()
/obj/structure/safe/attackby(obj/item/I as obj, mob/user as mob, params)
/obj/structure/safe/attackby(obj/item/I, mob/user, params)
if(open)
if(I.w_class + space <= maxspace)
space += I.w_class
code/game/objects/structures/spirit_board.dm
+4 -4
View File
@@ -14,17 +14,17 @@
desc = "[initial(desc)] The planchette is sitting at \"[planchette]\"."
..()
/obj/structure/spirit_board/attack_hand(mob/user as mob)
/obj/structure/spirit_board/attack_hand(mob/user)
if(..())
return
spirit_board_pick_letter(user)
/obj/structure/spirit_board/attack_ghost(mob/dead/observer/user as mob)
/obj/structure/spirit_board/attack_ghost(mob/dead/observer/user)
spirit_board_pick_letter(user)
/obj/structure/spirit_board/proc/spirit_board_pick_letter(var/mob/M)
/obj/structure/spirit_board/proc/spirit_board_pick_letter(mob/M)
if(!spirit_board_checks(M))
return 0
@@ -43,7 +43,7 @@
visible_message("<span class='notice'>The planchette slowly moves... and stops at the letter \"[planchette]\".</span>")
/obj/structure/spirit_board/proc/spirit_board_checks(var/mob/M)
/obj/structure/spirit_board/proc/spirit_board_checks(mob/M)
//cooldown
var/bonus = 0
if(M.ckey == lastuser)
code/game/objects/structures/statues.dm
+4 -4
View File
@@ -16,7 +16,7 @@
density = 0
..()
/obj/structure/statue/attackby(obj/item/weapon/W, mob/living/user as mob, params)
/obj/structure/statue/attackby(obj/item/weapon/W, mob/living/user, params)
add_fingerprint(user)
user.changeNext_move(CLICK_CD_MELEE)
if(istype(W, /obj/item/weapon/wrench))
@@ -80,7 +80,7 @@
..()
CheckHardness()
/obj/structure/statue/attack_hand(mob/living/user as mob)
/obj/structure/statue/attack_hand(mob/living/user)
user.changeNext_move(CLICK_CD_MELEE)
add_fingerprint(user)
user.visible_message("[user] rubs some dust off from the [name]'s surface.", \
@@ -198,14 +198,14 @@
PlasmaBurn(exposed_temperature)
/obj/structure/statue/plasma/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/statue/plasma/bullet_act(obj/item/projectile/Proj)
if(istype(Proj,/obj/item/projectile/beam))
PlasmaBurn(2500)
else if(istype(Proj,/obj/item/projectile/ion))
PlasmaBurn(500)
..()
/obj/structure/statue/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/structure/statue/plasma/attackby(obj/item/weapon/W, mob/user, params)
if(is_hot(W) > 300)//If the temperature of the object is over 300, then ignite
message_admins("Plasma statue ignited by [key_name_admin(user)](<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[user]'>FLW</A>) in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
log_game("Plasma statue ignited by [key_name(user)] in ([x],[y],[z])")
code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
+3 -3
View File
@@ -15,7 +15,7 @@
nest_overlay = image('icons/mob/alien.dmi', "nestoverlay", layer=MOB_LAYER - 0.2)
return ..()
/obj/structure/stool/bed/nest/user_unbuckle_mob(mob/user as mob)
/obj/structure/stool/bed/nest/user_unbuckle_mob(mob/user)
if(buckled_mob && buckled_mob.buckled == src)
var/mob/living/M = buckled_mob
if(M != user)
@@ -42,7 +42,7 @@
unbuckle_mob()
add_fingerprint(user)
/obj/structure/stool/bed/nest/user_buckle_mob(mob/M as mob, mob/user as mob)
/obj/structure/stool/bed/nest/user_buckle_mob(mob/M, mob/user)
if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || user.stat || M.buckled || istype(user, /mob/living/silicon/pai) )
return
@@ -71,7 +71,7 @@
M.layer = initial(M.layer)
overlays -= nest_overlay
/obj/structure/stool/bed/nest/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/structure/stool/bed/nest/attackby(obj/item/weapon/W, mob/user, params)
var/aforce = W.force
health = max(0, health - aforce)
playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+3 -3
View File
@@ -33,7 +33,7 @@
. = 0
buckled_mob.buckled = src
/obj/structure/stool/bed/Process_Spacemove(var/movement_dir = 0)
/obj/structure/stool/bed/Process_Spacemove(movement_dir = 0)
if(buckled_mob)
return buckled_mob.Process_Spacemove(movement_dir)
return ..()
@@ -43,10 +43,10 @@
return 1
return ..()
/obj/structure/stool/bed/attack_paw(mob/user as mob)
/obj/structure/stool/bed/attack_paw(mob/user)
return src.attack_hand(user)
/obj/structure/stool/bed/attack_animal(var/mob/living/simple_animal/M)//No more buckling hostile mobs to chairs to render them immobile forever
/obj/structure/stool/bed/attack_animal(mob/living/simple_animal/M)//No more buckling hostile mobs to chairs to render them immobile forever
if(M.environment_smash)
new /obj/item/stack/sheet/metal(src.loc)
qdel(src)
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+3 -3
View File
@@ -15,7 +15,7 @@
..()
handle_rotation()
/obj/structure/stool/bed/chair/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/structure/stool/bed/chair/attackby(obj/item/weapon/W, mob/user, params)
..()
if(istype(W, /obj/item/assembly/shock_kit))
if(!user.drop_item())
@@ -28,7 +28,7 @@
SK.loc = E
SK.master = E
qdel(src)
/obj/structure/stool/bed/chair/attack_tk(mob/user as mob)
/obj/structure/stool/bed/chair/attack_tk(mob/user)
if(buckled_mob)
..()
else
@@ -88,7 +88,7 @@
name = "wooden chair"
desc = "Old is never too old to not be in fashion."
/obj/structure/stool/bed/chair/wood/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/structure/stool/bed/chair/wood/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/wrench))
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
new /obj/item/stack/sheet/mineral/wood(src.loc)
code/game/objects/structures/stool_bed_chair_nest/stools.dm
+1 -1
View File
@@ -25,7 +25,7 @@
new /obj/item/stack/sheet/metal(src.loc)
qdel(src)
/obj/structure/stool/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/structure/stool/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/wrench))
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
new /obj/item/stack/sheet/metal(src.loc)
code/game/objects/structures/table_frames.dm
+2 -2
View File
@@ -20,7 +20,7 @@
var/framestack = /obj/item/stack/rods
var/framestackamount = 2
/obj/structure/table_frame/attackby(var/obj/item/I, mob/user, params)
/obj/structure/table_frame/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/wrench))
user << "<span class='notice'>You start disassembling [src]...</span>"
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
@@ -77,7 +77,7 @@
framestackamount = 2
burn_state = 0 //Burnable
/obj/structure/table_frame/wood/attackby(var/obj/item/I, mob/user, params)
/obj/structure/table_frame/wood/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/wrench))
..()
if(istype(I, /obj/item/stack/sheet/mineral/wood))
code/game/objects/structures/tables_racks.dm
+6 -6
View File
@@ -193,7 +193,7 @@
#define TBL_DISASSEMBLE 2
#define TBL_DECONSTRUCT 3
/obj/structure/table/proc/table_destroy(var/destroy_type, var/mob/user)
/obj/structure/table/proc/table_destroy(destroy_type, mob/user)
if(destroy_type == TBL_DESTROY)
for(var/i = 1, i <= framestackamount, i++)
@@ -318,7 +318,7 @@
buildstack = /obj/item/stack/sheet/plasteel
canSmoothWith = list(/obj/structure/table/reinforced, /obj/structure/table)
/obj/structure/table/reinforced/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/structure/table/reinforced/attackby(obj/item/weapon/W, mob/user, params)
if (istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
if(WT.remove_fuel(0, user))
@@ -397,7 +397,7 @@
else
return 0
/obj/structure/rack/MouseDrop_T(obj/O as obj, mob/user as mob)
/obj/structure/rack/MouseDrop_T(obj/O, mob/user)
if ((!( istype(O, /obj/item/weapon) ) || user.get_active_hand() != O))
return
if(isrobot(user))
@@ -409,7 +409,7 @@
step(O, get_dir(O, src))
return
/obj/structure/rack/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/structure/rack/attackby(obj/item/weapon/W, mob/user, params)
if (istype(W, /obj/item/weapon/wrench))
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
rack_destroy()
@@ -483,7 +483,7 @@
flags = CONDUCT
materials = list(MAT_METAL=3750)
/obj/item/weapon/rack_parts/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/item/weapon/rack_parts/attackby(obj/item/weapon/W, mob/user, params)
..()
if (istype(W, /obj/item/weapon/wrench))
new /obj/item/stack/sheet/metal( user.loc )
@@ -491,7 +491,7 @@
return
return
/obj/item/weapon/rack_parts/attack_self(mob/user as mob)
/obj/item/weapon/rack_parts/attack_self(mob/user)
user << "<span class='notice'>You start constructing rack...</span>"
if (do_after(user, 50, target = src))
if(!user.drop_item())
code/game/objects/structures/tank_dispenser.dm
+3 -3
View File
@@ -31,10 +31,10 @@
if(1 to 4) overlays += "plasma-[plasmatanks]"
if(5 to INFINITY) overlays += "plasma-5"
/obj/structure/dispenser/attack_paw(mob/user as mob)
/obj/structure/dispenser/attack_paw(mob/user)
return src.attack_hand(user)
/obj/structure/dispenser/attack_hand(mob/user as mob)
/obj/structure/dispenser/attack_hand(mob/user)
if(!user.IsAdvancedToolUser())
user << "<span class='warning'>You don't have the dexterity to do this!</span>"
return 1
@@ -47,7 +47,7 @@
return
/obj/structure/dispenser/attackby(obj/item/I as obj, mob/user as mob, params)
/obj/structure/dispenser/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/tank/internals/oxygen) || istype(I, /obj/item/weapon/tank/internals/air) || istype(I, /obj/item/weapon/tank/internals/anesthetic))
if(oxygentanks < 10)
if(!user.drop_item())
code/game/objects/structures/transit_tubes/station.dm
+2 -2
View File
@@ -42,7 +42,7 @@
//pod insertion
/obj/structure/transit_tube/station/MouseDrop_T(obj/structure/c_transit_tube_pod/R as obj, mob/user as mob)
/obj/structure/transit_tube/station/MouseDrop_T(obj/structure/c_transit_tube_pod/R, mob/user)
if(!user.canmove || user.stat || user.restrained())
return
if (!istype(R) || get_dist(user, src) > 1 || get_dist(src,R) > 1)
@@ -58,7 +58,7 @@
qdel(R)
/obj/structure/transit_tube/station/attack_hand(mob/user as mob)
/obj/structure/transit_tube/station/attack_hand(mob/user)
if(!pod_moving)
for(var/obj/structure/transit_tube_pod/pod in loc)
if(!pod.moving && pod.dir in directions())
code/game/objects/structures/transit_tubes/transit_tube_construction.dm
+2 -2
View File
@@ -10,7 +10,7 @@
anchored = 0.0
//wrapper for turn that changes the transit tube formatted icon_state instead of the dir
/obj/structure/c_transit_tube/proc/tube_turn(var/angle)
/obj/structure/c_transit_tube/proc/tube_turn(angle)
var/list/badtubes = list("W-E", "W-E-Pass", "S-N", "S-N-Pass", "SW-NE", "SE-NW")
var/list/split_text = text2list(icon_state, "-")
for(var/i=1; i<=split_text.len; i++)
@@ -77,7 +77,7 @@
R.generate_automatic_corners(R.tube_dirs)
return R
/obj/structure/c_transit_tube/attackby(var/obj/item/I, var/mob/user, params)
/obj/structure/c_transit_tube/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/wrench))
user << "<span class='notice'>You start attaching the [name]...</span>"
src.add_fingerprint(user)
code/game/objects/structures/transit_tubes/transit_tube_pod.dm
+2 -2
View File
@@ -25,7 +25,7 @@
..()
/obj/structure/transit_tube_pod/attackby(var/obj/item/I, var/mob/user, params)
/obj/structure/transit_tube_pod/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/crowbar))
if(!moving)
for(var/obj/structure/transit_tube/station/T in loc)
@@ -60,7 +60,7 @@
return 1
else return ..()
/obj/structure/transit_tube_pod/proc/follow_tube(var/reverse_launch)
/obj/structure/transit_tube_pod/proc/follow_tube(reverse_launch)
if(moving)
return
code/game/objects/structures/watercloset.dm
+2 -2
View File
@@ -451,12 +451,12 @@
name = "puddle"
icon_state = "puddle"
/obj/structure/sink/puddle/attack_hand(mob/M as mob)
/obj/structure/sink/puddle/attack_hand(mob/M)
icon_state = "puddle-splash"
..()
icon_state = "puddle"
/obj/structure/sink/puddle/attackby(obj/item/O as obj, mob/user as mob, params)
/obj/structure/sink/puddle/attackby(obj/item/O, mob/user, params)
icon_state = "puddle-splash"
..()
icon_state = "puddle"
code/game/objects/structures/windoor_assembly.dm
+3 -3
View File
@@ -53,13 +53,13 @@
else
return 1
/obj/structure/windoor_assembly/CanAtmosPass(var/turf/T)
/obj/structure/windoor_assembly/CanAtmosPass(turf/T)
if(get_dir(loc, T) == dir)
return !density
else
return 1
/obj/structure/windoor_assembly/CheckExit(atom/movable/mover as mob|obj, turf/target as turf)
/obj/structure/windoor_assembly/CheckExit(atom/movable/mover as mob|obj, turf/target)
if(istype(mover) && mover.checkpass(PASSGLASS))
return 1
if(get_dir(loc, target) == dir)
@@ -68,7 +68,7 @@
return 1
/obj/structure/windoor_assembly/attackby(obj/item/W as obj, mob/user as mob, params)
/obj/structure/windoor_assembly/attackby(obj/item/W, mob/user, params)
//I really should have spread this out across more states but thin little windoors are hard to sprite.
add_fingerprint(user)
switch(state)
code/game/objects/structures/window.dm
+10 -10
View File
@@ -41,7 +41,7 @@
return
/obj/structure/window/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/window/bullet_act(obj/item/projectile/Proj)
if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
health -= Proj.damage
update_nearby_icons()
@@ -83,7 +83,7 @@
return 1
/obj/structure/window/CheckExit(atom/movable/O as mob|obj, target as turf)
/obj/structure/window/CheckExit(atom/movable/O as mob|obj, target)
if(istype(O) && O.checkpass(PASSGLASS))
return 1
if(get_dir(O.loc, target) == dir)
@@ -115,7 +115,7 @@
spawnfragments()
update_nearby_icons()
/obj/structure/window/attack_tk(mob/user as mob)
/obj/structure/window/attack_tk(mob/user)
user.changeNext_move(CLICK_CD_MELEE)
user.visible_message("<span class='notice'>Something knocks on [src].</span>")
add_fingerprint(user)
@@ -131,7 +131,7 @@
hit(50)
return 1
/obj/structure/window/attack_hand(mob/user as mob)
/obj/structure/window/attack_hand(mob/user)
if(!can_be_reached(user))
return
user.changeNext_move(CLICK_CD_MELEE)
@@ -139,11 +139,11 @@
add_fingerprint(user)
playsound(loc, 'sound/effects/Glassknock.ogg', 50, 1)
/obj/structure/window/attack_paw(mob/user as mob)
/obj/structure/window/attack_paw(mob/user)
return attack_hand(user)
/obj/structure/window/proc/attack_generic(mob/user as mob, damage = 0) //used by attack_alien, attack_animal, and attack_slime
/obj/structure/window/proc/attack_generic(mob/user, damage = 0) //used by attack_alien, attack_animal, and attack_slime
if(!can_be_reached(user))
return
user.changeNext_move(CLICK_CD_MELEE)
@@ -156,13 +156,13 @@
playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1)
/obj/structure/window/attack_alien(mob/living/user as mob)
/obj/structure/window/attack_alien(mob/living/user)
user.do_attack_animation(src)
if(islarva(user)) return
attack_generic(user, 15)
update_nearby_icons()
/obj/structure/window/attack_animal(mob/living/user as mob)
/obj/structure/window/attack_animal(mob/living/user)
if(!isanimal(user))
return
@@ -174,7 +174,7 @@
attack_generic(M, M.melee_damage_upper)
update_nearby_icons()
/obj/structure/window/attack_slime(mob/living/simple_animal/slime/user as mob)
/obj/structure/window/attack_slime(mob/living/simple_animal/slime/user)
user.do_attack_animation(src)
if(!user.is_adult)
return
@@ -282,7 +282,7 @@
return 0
return 1
/obj/structure/window/proc/hit(var/damage, var/sound_effect = 1)
/obj/structure/window/proc/hit(damage, sound_effect = 1)
if(reinf)
damage *= 0.5
health = max(0, health - damage)