Putnam3145
|
b09ef97ae3
|
Merge pull request #10305 from BlackMajor/Yeehaw
Various Mining borg changes. And some extras.
|
2020-01-07 16:50:21 -08:00 |
|
BlackMajor
|
05a644cc41
|
Revert "Merge branch 'master' into Yeehaw"
This reverts commit 972c03f79f, reversing
changes made to 8ebd698763.
|
2020-01-08 12:26:45 +13:00 |
|
BlackMajor
|
972c03f79f
|
Merge branch 'master' into Yeehaw
|
2020-01-08 12:25:50 +13:00 |
|
BlackMajor
|
b41c9cd844
|
Sync with master
|
2020-01-08 12:25:22 +13:00 |
|
Lin
|
c162e9bb5d
|
Merge pull request #10453 from Ghommie/Ghommie-cit500
Fixing an edge case runtime with ore bags.
|
2020-01-07 19:37:49 +00:00 |
|
Ghommie
|
4cc0833b28
|
Fixing an edge case runtime with ore bags.
|
2020-01-06 01:45:53 +01:00 |
|
Hatterhat
|
7c98656939
|
upstream merge
|
2020-01-04 01:48:50 -06:00 |
|
Hatterhat
|
186194418e
|
tg 43454+43688 port, tweaks w/ trilby, db crate
|
2020-01-04 01:33:32 -06:00 |
|
BlackMajor
|
08d042901c
|
thank you github
|
2020-01-02 22:16:47 +13:00 |
|
BlackMajor
|
aabb39a364
|
Revert "Merge branch 'master' into Yeehaw"
This reverts commit 30e3edaac1, reversing
changes made to 62c8fce043.
|
2020-01-02 22:06:31 +13:00 |
|
BlackMajor
|
30e3edaac1
|
Merge branch 'master' into Yeehaw
|
2020-01-02 22:03:58 +13:00 |
|
BlackMajor
|
3239acf74d
|
Sync
|
2020-01-02 22:02:55 +13:00 |
|
nik707
|
be9912227f
|
Merge pull request #10372 from Hatterhat/the-one-with-the-forcefields
forcefield projectors on toolbelts, cool and good sprites for atmos holofan/forcefield proj
|
2020-01-01 20:28:15 -06:00 |
|
Ghom
|
0453363d4c
|
Merge pull request #10345 from Trilbyspaceclone/patch-256
Buffs bandoliers to hold more types of casings.
|
2019-12-31 14:36:53 +01:00 |
|
Hatterhat
|
5a497b02ac
|
hey i'm WALKIN here
|
2019-12-31 01:56:01 -06:00 |
|
Seris02
|
40730b48d5
|
few fixes
|
2019-12-30 11:49:16 +08:00 |
|
Trilbyspaceclone
|
4a5715e5ac
|
Update belt.dm
|
2019-12-29 19:13:32 -05:00 |
|
Seris02
|
a39c0249c4
|
marshmallow
|
2019-12-29 21:55:25 +08:00 |
|
BlackMajor
|
62b3c1e65b
|
Makes pick up range work
|
2019-12-30 02:28:23 +13:00 |
|
BlackMajor
|
b811d3e57e
|
More work on it
|
2019-12-30 01:23:41 +13:00 |
|
Hatterhat
|
d1c96237a6
|
the very shitty idea: "muh speedloader"
|
2019-12-24 04:16:33 -06:00 |
|
nik707
|
63dd3487b3
|
Merge pull request #10090 from Hatterhat/the-one-where-a-4-tc-nukies-kit-gets-buffed
the one where the combat medic kit gets buffed
|
2019-12-19 14:11:27 -06:00 |
|
Hatterhat
|
a1cc129d0b
|
slightly better storage, cucks the surgery duffel
|
2019-12-13 21:10:12 -06:00 |
|
Ghommie
|
414d4b7a90
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408
|
2019-12-09 00:04:22 +01:00 |
|
Hatterhat
|
6ff7083bfb
|
the one where i buff a 4 tc item, give trilby a (You), and squash my commits
|
2019-12-08 01:29:08 -06:00 |
|
Winter Flare
|
8bd6c58bcd
|
Merge branch 'master' into cargocleanupv2boogaloo
|
2019-12-06 01:27:44 -05:00 |
|
Winter Flare
|
b860c6e0bb
|
Merge branch 'master' into cargocleanupv2boogaloo
|
2019-12-06 01:14:44 -05:00 |
|
Putnam3145
|
4e022af46f
|
Merge pull request #10056 from Ghommie/Ghommie-cit430
Ports "Slightly improves visible and audible messages."
|
2019-12-05 21:16:47 -08:00 |
|
kevinz000
|
8cb6ff10b8
|
Merge pull request #10034 from Ghommie/Ghommie-cit420
Fixes the incongruent bone satchel description.
|
2019-12-05 22:00:38 -07:00 |
|
kevinz000
|
b8bb0f2924
|
Merge pull request #10048 from Ghommie/Ghommie-cit426
Demodularize moodlets.
|
2019-12-05 21:56:29 -07:00 |
|
Putnam3145
|
6b2d3b116d
|
Merge branch 'master' into Ghommie-cit430
|
2019-12-05 20:53:14 -08:00 |
|
Ghommie
|
9ca7bb759c
|
Ports "Slightly improves visible and audible messages."
|
2019-12-06 02:02:12 +01:00 |
|
Ghommie
|
77ef3dabea
|
Demodularize moodlets.
|
2019-12-04 23:10:39 +01:00 |
|
Trilbyspaceclone
|
2a591df09a
|
Update wallets.dm
|
2019-12-04 12:50:18 -05:00 |
|
Ghommie
|
3fb485c721
|
Fixes the incongruent bone satchel description.
|
2019-12-03 22:39:07 +01:00 |
|
Lin
|
99e9c7299e
|
Merge pull request #10004 from Ghommie/Ghommie-cit414
Unmodularizing first aid kits.
|
2019-12-03 01:30:51 +00:00 |
|
Putnam3145
|
8d09f5a082
|
Merge branch 'master' into tinytweaks
|
2019-12-01 23:24:56 -08:00 |
|
Ghommie
|
f5b4d6a0ad
|
Oh bummers.
|
2019-11-29 07:27:05 +01:00 |
|
Ghommie
|
9b8ed8ca4f
|
The fact we hit 10k on issues/PRs is not a good reason to make crappy PRs.
|
2019-11-29 07:14:51 +01:00 |
|
Ghommie
|
3b8aebbbc2
|
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
|
2019-11-29 00:40:16 +01:00 |
|
Ghommie
|
efcf79aab0
|
teachin' 🅱️ how to swim
|
2019-11-28 02:32:43 +01:00 |
|
Ghommie
|
13b9158a44
|
Ports "Plasmamen get plasma in their box"
|
2019-11-28 02:30:03 +01:00 |
|
Winter Flare
|
6a4c959b0a
|
Added more crates.
|
2019-11-24 19:05:03 -05:00 |
|
BlackMajor
|
c81d1fe7a3
|
Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
|
2019-11-25 11:31:03 +13:00 |
|
kevinz000
|
75510d8da9
|
Merge pull request #9749 from Trilbyspaceclone/patch-238
What do you mean I cant hold the armory on my back? -BOH nerf
|
2019-11-23 11:42:37 -07:00 |
|
Winter Flare
|
03dae580a9
|
Minor QoL and Wardrobe Updates
|
2019-11-22 14:08:12 -05:00 |
|
Lin
|
2412bad483
|
Merge pull request #9889 from GrayRachnid/fixgoldbox
Fixes gold toolbox inhand sprite having the wrong name
|
2019-11-22 01:14:39 +00:00 |
|
GrayRachnid
|
4ae76cf1d9
|
WHY
D
|
2019-11-20 23:11:46 -05:00 |
|
GrayRachnid
|
48d1bd1160
|
fixes goldbox
|
2019-11-20 18:47:35 -05:00 |
|
Useroth
|
e2c8efa824
|
Oopsie. I need to stop committing code without comipiling.
|
2019-11-20 15:36:55 +01:00 |
|