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

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

Browse Source
This commit is contained in:
Zuhayr
2016-01-20 08:01:14 +10:30
parent 4f0a2354f6 9b449cc183
commit e557a71fdc
135 changed files with 1963 additions and 1524 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttles/shuttle_console.dm
+7 -1
View File
@@ -93,4 +93,10 @@
return 1
/obj/machinery/computer/shuttle_control/bullet_act(var/obj/item/projectile/Proj)
visible_message("[Proj] ricochets off [src]!")
visible_message("\The [Proj] ricochets off \the [src]!")
/obj/machinery/computer/shuttle_control/ex_act()
return
/obj/machinery/computer/shuttle_control/emp_act()
return