Commit Graph

8 Commits

Author SHA1 Message Date
deathride58
c163176e5d Adds Slappers (#31406)
* ADDS SLAPPERS

* fixes everything, just need sprites

* nerfs criticism
2017-10-10 19:54:30 -05:00
LetterJay
447937477e more oopsies 2017-09-11 13:50:49 -05:00
LetterJay
3dbfac920a Update weaponry.dm 2017-09-10 11:48:28 -05:00
ShizCalev
d8a3b87719 Fixes brains counting towards highlander killstreaks 2017-09-07 05:14:39 -05:00
LetterJay
2fe2912fa3 Merge pull request #2496 from Citadel-Station-13/upstream-merge-30173
[MIRROR] Traitor, a traitor is a traitor.
2017-08-28 08:46:53 -05:00
kevinz000
3254fcf535 goddamnit_again (#2511) 2017-08-26 18:43:57 -07:00
CitadelStationBot
3a6a277f08 Traitor, a traitor is a traitor. 2017-08-26 11:07:24 -05:00
kevinz000
c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
2017-08-24 21:07:58 -07:00