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

Merge pull request #5855 from Novacat/nova-basicfixes

Browse Source 
Emergency quick bugfixes
This commit is contained in:
Novacat
2019-09-14 01:48:08 -04:00
committed by GitHub
parent 013437f96f e0a762949d
commit 7f5256b4d4
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/suit_storage_unit.dm
+1 -1
View File
@@ -648,7 +648,7 @@
model_text = "Exploration"
departments = list("Exploration","Old Exploration")
/obj/machinery/suit_cycler/exploreration/Initialize()
/obj/machinery/suit_cycler/exploration/Initialize()
species -= SPECIES_TESHARI
return ..()
code/game/turfs/unsimulated/sky_vr.dm
+4 -2
View File
@@ -27,8 +27,10 @@
return //Don't ghostport, very annoying
if(AM.throwing)
return //Being thrown over, not fallen yet
if(/obj/item/projectile)
return // Bullets/lasers/pewpew should not fall out of the sky. pew.
if(istype(AM, /obj/item/projectile))
return // pewpew should not fall out of the sky. pew.
if(istype(AM, /obj/effect/projectile))
return // ...neither should the effects be falling
var/mob/living/L
if(isliving(AM))