cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5577 from Anewbe/grilles

Browse Source 
Fixes a couple of tool related oversight/runtimes
This commit is contained in:
Neerti
2018-09-19 16:08:37 -04:00
committed by GitHub
parent bc331befd9 765106986d
commit aec83fd4f2
2 changed files with 70 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/machinery/doors/door.dm
View File

@@ -205,6 +205,7 @@
/obj/machinery/door/attackby(obj/item/I as obj, mob/user as mob)
src.add_fingerprint(user)
if(istype(I))
if(istype(I, /obj/item/stack/material) && I.get_material_name() == src.get_material_name())
if(stat & BROKEN)
user << "<span class='notice'>It looks like \the [src] is pretty busted. It's going to need more than just patching up now.</span>"
@@ -275,9 +276,11 @@
take_damage(W.force)
return
if(src.operating > 0 || isrobot(user)) return //borgs can't attack doors open because it conflicts with their AI-like interaction with them.
if(src.operating > 0 || isrobot(user))
return //borgs can't attack doors open because it conflicts with their AI-like interaction with them.
if(src.operating) return
if(src.operating)
return
if(src.allowed(user) && operable())
if(src.density)

4
code/game/objects/structures/grille.dm
View File

@@ -93,7 +93,7 @@
src.health -= damage*0.2
spawn(0) healthcheck() //spawn to make sure we return properly if the grille is deleted
/obj/structure/grille/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/grille/attackby(obj/item/W as obj, mob/user as mob)
if(!istype(W))
return
if(W.is_wirecutter())
@@ -109,7 +109,7 @@
"<span class='notice'>You have [anchored ? "fastened the grille to" : "unfastened the grille from"] the floor.</span>")
return
//window placing begin //TODO CONVERT PROPERLY TO MATERIAL DATUM
//window placing begin //TODO CONVERT PROPERLY TO MATERIAL DATUM
else if(istype(W,/obj/item/stack/material))
var/obj/item/stack/material/ST = W
if(!ST.material.created_window)