cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 17:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Converts some istype's to use helpers (#3224)

Browse Source 
Converts various istype's to use helpers. Mainly:
Cable
Wrench
Screwdriver
Multitool
Crowbar
Wirecutter

And makes the helpers defines.
This commit is contained in:
Ron
2017-08-06 15:08:42 -04:00
committed by Erki
parent ad96a34dd8
commit cb5e227320
219 changed files with 546 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/tables/tables.dm
View File

@@ -103,7 +103,7 @@
/obj/structure/table/attackby(obj/item/weapon/W, mob/user)
if(reinforced && istype(W, /obj/item/weapon/screwdriver))
if(reinforced && isscrewdriver(W))
remove_reinforced(W, user)
if(!reinforced)
update_desc()
@@ -111,7 +111,7 @@
update_material()
return 1
if(carpeted && istype(W, /obj/item/weapon/crowbar))
if(carpeted && iscrowbar(W))
user.visible_message("<span class='notice'>\The [user] removes the carpet from \the [src].</span>",
"<span class='notice'>You remove the carpet from \the [src].</span>")
new /obj/item/stack/tile/carpet(loc)
@@ -130,7 +130,7 @@
else
user << "<span class='warning'>You don't have enough carpet!</span>"
if(!reinforced && !carpeted && material && istype(W, /obj/item/weapon/wrench))
if(!reinforced && !carpeted && material && iswrench(W))
remove_material(W, user)
if(!material)
update_connections(1)
@@ -141,11 +141,11 @@
update_material()
return 1
if(!carpeted && !reinforced && !material && istype(W, /obj/item/weapon/wrench))
if(!carpeted && !reinforced && !material && iswrench(W))
dismantle(W, user)
return 1
if(health < maxhealth && istype(W, /obj/item/weapon/weldingtool))
if(health < maxhealth && iswelder(W))
var/obj/item/weapon/weldingtool/F = W
if(F.welding)
user << "<span class='notice'>You begin reparing damage to \the [src].</span>"