cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-29 19:42:42 +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

4
code/modules/assembly/bomb.dm
View File

@@ -26,7 +26,7 @@
if(istype(W, /obj/item/device/analyzer))
bombtank.attackby(W, user)
return
if(istype(W, /obj/item/weapon/wrench) && !status) //This is basically bomb assembly code inverted. apparently it works.
if(iswrench(W) && !status) //This is basically bomb assembly code inverted. apparently it works.
user << "<span class='notice'>You disassemble [src].</span>"
@@ -40,7 +40,7 @@
qdel(src)
return
if((istype(W, /obj/item/weapon/weldingtool) && W:welding))
if((iswelder(W) && W:welding))
if(!status)
status = 1
bombers += "[key_name(user)] welded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]"

4
code/modules/assembly/shock_kit.dm
View File

@@ -15,7 +15,7 @@
return ..()
/obj/item/assembly/shock_kit/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/wrench) && !status)
if(iswrench(W) && !status)
var/turf/T = loc
if(ismob(T))
T = T.loc
@@ -27,7 +27,7 @@
part2 = null
qdel(src)
return
if(istype(W, /obj/item/weapon/screwdriver))
if(isscrewdriver(W))
status = !status
user << "<span class='notice'>[src] is now [status ? "secured" : "unsecured"]!</span>"
add_fingerprint(user)