cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor

Browse Source 
# Conflicts:
#	code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
#	code/game/objects/effects/portals.dm
This commit is contained in:
phil235
2016-09-29 01:44:27 +02:00
parent 7c6c99683d 69281c24ad
commit 194398cbbd
173 changed files with 879 additions and 839 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/holodeck/computer.dm
+1 -1
View File
@@ -204,6 +204,6 @@
emergency_shutdown()
..()
/obj/machinery/computer/holodeck/blob_act(obj/effect/blob/B)
/obj/machinery/computer/holodeck/blob_act(obj/structure/blob/B)
emergency_shutdown()
..()