CitadelStationBot
d62cb31e9b
[MIRROR] Shuffles Exited() call to after loc is actually changed in forceMove. Fixes storage forcing everything to mouse opacity fulltile ( #6884 )
...
* Delete some duplicate macro definitions
* sql changelog changes ping the host
* Templates the caravan ambush ruin shuttles
* Update CODEOWNERS
* Update components.dm
* Shuffles Exited() call to after loc is actually changed in forceMove. Fixes storage forcing everything to mouse opacity fulltile
* Initial Placeholder
* Update caravanambush.dmm
2018-05-27 19:27:56 -07:00
LetterJay
0758204515
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:12:07 -05:00
LetterJay
1e207a7430
modular_citadel
2018-05-20 23:04:13 -05:00
deathride58
4d3ead744a
Update wallets.dm
2018-05-16 12:15:29 -04:00
CitadelStationBot
ccaddb17e2
Update wallets.dm
2018-05-13 20:59:02 -05:00
Tad Hardesty
9ef257db50
[s] Fix wallets acting as though they still contain removed IDs
2018-05-09 10:32:00 -05:00
deathride58
6a07a66cb3
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
kevinz000
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -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
deathride58
b6630b41d1
merges #3877 proper
2017-11-22 17:37:22 -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
