cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 13:09:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merges AI Branch into Master

Browse Source
This commit is contained in:
Atermonera
2018-12-01 00:06:38 -05:00
committed by VirgoBot
parent 15017e893e
commit 2df5e9fe0e
379 changed files with 22460 additions and 4751 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/tools/screwdriver.dm
+1 -1
View File
@@ -122,4 +122,4 @@
counterpart.forceMove(get_turf(src))
src.forceMove(counterpart)
user.put_in_active_hand(counterpart)
to_chat(user, "<span class='notice'>You attach the bolt driver bit to [src].</span>")
to_chat(user, "<span class='notice'>You attach the bolt driver bit to [src].</span>")
code/game/objects/items/weapons/tools/weldingtool.dm
+7
View File
@@ -1,3 +1,7 @@
<<<<<<< HEAD
=======
>>>>>>> 3155d58... Merge pull request #5735 from Neerti/hopefully_last_master_sync
#define WELDER_FUEL_BURN_INTERVAL 13
/*
* Welding Tool
@@ -317,7 +321,10 @@
var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name[O_EYES]
if(!E)
return
<<<<<<< HEAD
if(H.nif && H.nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) return //VOREStation Add - NIF
=======
>>>>>>> 3155d58... Merge pull request #5735 from Neerti/hopefully_last_master_sync
switch(safety)
if(1)
to_chat(usr, "<span class='warning'>Your eyes sting a little.</span>")
code/game/objects/items/weapons/tools/wrench.dm
+1 -1
View File
@@ -68,4 +68,4 @@
counterpart.forceMove(get_turf(src))
src.forceMove(counterpart)
user.put_in_active_hand(counterpart)
to_chat(user, "<span class='notice'>You attach the screw driver bit to [src].</span>")
to_chat(user, "<span class='notice'>You attach the screw driver bit to [src].</span>")