shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
daed810c3ae11f441a18a96209ec6e0943dfef1d
GS13NG/code/modules/antagonists
History
Keate Senior daed810c3a I didn't get to see if it'd still conflict with the clickdelay testmerge 
ugghh I shouldn't be coding when my second brain cell falls asleep but hey at least the change is incredibly small
2020-07-28 12:59:34 -04:00
..
_common
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-30 02:30:29 +03:00
abductor
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-16 19:39:46 -07:00
blob
Conflicts!!!
2020-06-22 17:39:24 +03:00
blood_contract
…
bloodsucker
Merge pull request #12819 from Arturlang/bloodsucker_typo
2020-07-20 16:53:42 -07:00
brainwashing
…
brother
…
changeling
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-16 19:39:46 -07:00
clockcult
I didn't get to see if it'd still conflict with the clickdelay testmerge
2020-07-28 12:59:34 -04:00
collector
…
cult
whew
2020-07-07 20:48:54 -07:00
devil
Conflicts!!!
2020-06-22 17:39:24 +03:00
disease
Ports https://github.com/tgstation/tgstation/pull/51585
2020-06-17 17:07:42 +03:00
ert
Ports https://github.com/tgstation/tgstation/pull/51585
2020-06-17 17:07:42 +03:00
fugitive
update antag huds
2020-06-16 18:45:06 +01:00
greentext
…
greybois
…
highlander
…
magic_servant
…
monkey
Ports https://github.com/tgstation/tgstation/pull/51585
2020-06-17 17:07:42 +03:00
morph
…
nightmare
Ports https://github.com/tgstation/tgstation/pull/51585
2020-06-17 17:07:42 +03:00
ninja
Ports https://github.com/tgstation/tgstation/pull/51585
2020-06-17 17:07:42 +03:00
nukeop
Ports https://github.com/tgstation/tgstation/pull/51585
2020-06-17 17:07:42 +03:00
official
Ports https://github.com/tgstation/tgstation/pull/51585
2020-06-17 17:07:42 +03:00
overthrow
…
pirate
Ports https://github.com/tgstation/tgstation/pull/51585
2020-06-17 17:07:42 +03:00
revenant
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
revolution
…
santa
Ports https://github.com/tgstation/tgstation/pull/51585
2020-06-17 17:07:42 +03:00
separatist
…
slaughter
Ports https://github.com/tgstation/tgstation/pull/51585
2020-06-17 17:07:42 +03:00
survivalist
kay
2020-07-15 14:58:51 -07:00
swarmer
Merge pull request #12800 from DeltaFire15/swarmer-fix
2020-07-20 16:55:00 -07:00
traitor
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-26 14:03:27 +03:00
valentines
…
wishgranter
…
wizard
Merge pull request #12786 from silicons/survivalists
2020-07-20 18:20:08 -05:00
xeno
Ports https://github.com/tgstation/tgstation/pull/51585
2020-06-17 17:07:42 +03:00