LetterJay
e4eb4939b4
Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582
...
[MIRROR] Makes more messages pronoun sensitive
2018-05-23 07:46:26 -05:00
LetterJay
06b7cdf27a
Merge branch 'master' into upstream-merge-37529
2018-05-22 08:02:46 -05:00
LetterJay
5f27ac30c7
Merge branch 'master' into upstream-merge-37582
2018-05-22 07:22:42 -05:00
ShizCalev
b5a95e9da8
Makes more messages pronoun sensitive
2018-05-03 17:46:25 -05:00
vuonojenmustaturska
f373b2c9e6
Kills off three more flags from flags_2
2018-04-29 17:30:55 -05:00
oranges
7d45e045a3
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
Poojawa
cc6b320f83
game folder
2018-04-23 00:17:28 -05:00
Jordan Brown
fd479e7128
Replaces some var values with defines
2018-02-10 11:11:09 -06:00
CitadelStationBot
7126b61205
[MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag ( #5327 )
...
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag
* really? Like, a dozen fucking map conflicts. this map was fucked entirely
2018-02-06 19:06:31 -06:00
vuonojenmustaturska
7f90427a40
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -06:00
CitadelStationBot
cc0b768c72
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES ( #4014 )
...
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
2017-12-11 16:36:38 -08:00
CitadelStationBot
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
LetterJay
dddf85a7df
Update bags.dm
2017-09-30 14:23:03 -05:00
ShizCalev
f8f599b17b
Stops putting RCD, bluespace bags, and staves into ORM
2017-09-29 19:33:37 -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
