LetterJay
f57929b26c
Update book.dm
2017-10-04 21:14:25 -05:00
LetterJay
1a70aa0227
Merge pull request #3041 from Citadel-Station-13/upstream-merge-30887
...
[MIRROR] 2H Sword to the Cult Forge - Robustin's Github Adventure
2017-10-04 19:06:02 -04:00
KorPhaeron
3e26e09db8
ismecha define
2017-10-02 01:04:53 -05:00
LetterJay
2cafd6fefb
Merge pull request #3060 from Citadel-Station-13/upstream-merge-31086
...
[MIRROR] Adds desc to things lacking them.
2017-10-01 23:37:35 -04:00
bawhoppen
82981339ed
Adds desc to things lacking them.
2017-10-01 15:07:37 -05:00
Jordan Brown
3a83b28bae
Adds the Cargo-Tech-of-the-Shift award
2017-10-01 09:43:20 -05:00
Robustin
1a53d9e524
2H Sword to the Cult Forge - Robustin's Github Adventure
2017-10-01 00:02:04 -05:00
LetterJay
11b558c367
Merge branch 'master' into upstream-merge-31093
2017-10-01 00:50:26 -04:00
LetterJay
dddf85a7df
Update bags.dm
2017-09-30 14:23:03 -05:00
LetterJay
47a65d829d
Merge branch 'master' into upstream-merge-29741
2017-09-30 13:35:47 -04:00
LetterJay
f1858a3a63
Merge pull request #2996 from Citadel-Station-13/upstream-merge-30988
...
[MIRROR] Alt-clicking descriptions when examining
2017-09-30 12:57:52 -04:00
ShizCalev
f8f599b17b
Stops putting RCD, bluespace bags, and staves into ORM
2017-09-29 19:33:37 -05:00
kingofkosmos
f0c684c15e
Alt-clicking descriptions when examining
2017-09-28 21:51:53 -05:00
Robustin
3fe37eb41b
Secure containers give more hints, no RNG, for hacking ( #30864 )
...
* Automatic changelog generation for PR #30056 [ci skip]
* Delete AutoChangeLog-pr-30056.yml
* Removes bad RNG
* More instructions
* gud grammer
* Right parenthesis
* Update secure.dm
* Update secure.dm
* Update secure.dm
* less explicit
2017-09-28 21:41:07 -05:00
LetterJay
e1c103116e
Update toolbox.dm
2017-09-27 17:35:52 -05:00
LetterJay
6402ee86e0
Update belt.dm
2017-09-27 17:35:33 -05:00
Ashe Higgs
e575bd6685
(Ready) Clockwork Cult Rework: Proof-of-concept
2017-09-26 15:22:09 -05:00
CitadelStationBot
2a860d1954
[MIRROR] More Initialize() fixes, requires someone to test with DB ( #2857 )
...
* More Initialize() fixes, requires someone to test with DB
* fucking mirror failure
2017-09-22 23:35:22 -05:00
CitadelStationBot
6efb76fad5
[MIRROR] Ammo cleanup ( #2643 )
...
* Ammo cleanup
* Update briefcase.dm
* Update manned_turret.dm
* Update mime.dm
* Update manned_turret.dm
* Update manned_turret.dm
* fixes
* mime memes
2017-09-22 22:30:44 -05:00
CitadelStationBot
201cb984c8
[MIRROR] Fix ingredient box icon (again) ( #2823 )
...
* Fix ingredient boxes
* Fix ingredient box icon (again)
2017-09-17 22:36:21 -05:00
kingofkosmos
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -05:00
LetterJay
24a7aa5a9f
Merge branch 'master' into upstream-merge-30079
2017-09-06 09:24:23 -05:00
LetterJay
2bfc7872fa
cleanup
2017-09-02 07:06:37 -05:00
kevinz000
9cb65df70d
Merge pull request #2426
2017-08-29 22:27:21 -07:00
kevinz000
408acdd66d
sync
2017-08-29 22:05:16 -07:00
kevinz000
5591afc9ce
double wew
2017-08-29 09:53:11 -07:00
kevinz000
301a581e64
sync
2017-08-29 09:41:11 -07:00
LetterJay
292f5d5d35
Update boxes.dm
2017-08-29 01:46:21 -05:00
CitadelStationBot
f191f5c827
Fixes ingredients-box sprite.
2017-08-28 14:39:03 -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
