cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 21:19:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4451 from Tastyfish/is_mech

Browse Source 
Makes is_mechanical() use OOP, removes bizarre chain procs
This commit is contained in:
Fox McCloud
2016-05-19 19:06:05 -04:00
parent b4ea955d54 ef3859203b
commit dd8feb687b
7 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/policetape.dm
+2 -2
View File
@@ -166,7 +166,7 @@ var/list/tape_roll_applications = list()
/obj/item/tape/attack_hand(mob/user as mob)
if (user.a_intent == I_HELP && src.allowed(user))
user.show_viewers("\blue [user] lifts [src], allowing passage.")
user.visible_message("<span class=notice>[user] lifts [src], allowing passage.</span>", "<span class=notice>You lift [src], allowing passage.</span>")
src.density = 0
spawn(200)
src.density = 1
@@ -180,7 +180,7 @@ var/list/tape_roll_applications = list()
if(user.a_intent == I_HELP && ((!can_puncture(W) && src.allowed(user))))
to_chat(user, "You can't break the [src] with that!")
return
user.show_viewers("\blue [user] breaks the [src]!")
user.visible_message("<span class=warning>[user] breaks the [src]!</span>", "<span class=warning>You break the [src]!</span>")
var/dir[2]
var/icon_dir = src.icon_state
code/game/objects/structures/crates_lockers/closets.dm
+1 -1
View File
@@ -320,7 +320,7 @@
return
step_towards(O, src.loc)
if(user != O)
user.show_viewers("<span class='danger'>[user] stuffs [O] into [src]!</span>")
user.visible_message("<span class='danger'>[user] stuffs [O] into [src]!</span>", "<span class='danger'>You stuff [O] into [src]!</span>")
src.add_fingerprint(user)
/obj/structure/closet/attack_ai(mob/user)