cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 23:17:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Conflict Resolution

Browse Source 
Also fixes a compiling error with previous PR
This commit is contained in:
Unknown
2019-03-28 17:24:03 -04:00
parent 9d056decda
commit ad181e797a
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/fluffstuff/custom_items_vr.dm
+2 -2
View File
@@ -623,7 +623,7 @@
/obj/item/weapon/storage/backpack/saddlebag/tempest/ui_action_click()
ambulance = !(ambulance)
if(ambulance)
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
item_state = "tempestsaddlebag-amb"
icon_state = "tempestbag-amb"
if (ismob(loc))
@@ -644,7 +644,7 @@
/obj/item/weapon/storage/backpack/saddlebag/tempest/process()
if(!ambulance)
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
return
if(world.time - ambulance_last_switch > 15)
ambulance_state = !(ambulance_state)