cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 15:38:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4751 from VOREStation/upstream-merge-5869

Browse Source 
[MIRROR] Adds the Zaddat Race + Modifies pressure damage calculations
This commit is contained in:
Novacat
2019-03-28 18:17:11 -04:00
committed by GitHub
parent da5d9c5013 ad181e797a
commit 65cd059497
42 changed files with 405 additions and 22 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)