cyberpresidentvanellope/GS13-Citadel
1
0
Fork 0
mirror of https://github.com/evilew/GS13-Citadel.git synced 2026-08-28 07:39:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

more merge conflict fixes

Browse Source
This commit is contained in:
Seris02
2020-01-24 10:14:31 +08:00
parent 379d5b9463 4888e1522a
commit 9761d68f4b
315 changed files with 15287 additions and 11002 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/throwing.dm
+1
View File
@@ -55,6 +55,7 @@ SUBSYSTEM_DEF(throwing)
var/dist_y
var/dx
var/dy
var/force = MOVE_FORCE_DEFAULT
var/pure_diagonal
var/diagonal_error
var/datum/callback/callback