 TrilbySpaceClone
|
e5c8f7bf06
|
Merge branch 'master' into glassware
|
2019-12-07 12:50:32 -05:00 |
|
|
Putnam3145
|
cece6dd43d
|
Merge pull request #10098 from Ghommie/Ghommie-cit445
Fixes a lil issue with ice cream cones.
|
2019-12-07 08:48:21 -08:00 |
|
|
Ghommie
|
d38475f06d
|
i'm tired of this
|
2019-12-07 12:05:12 +01:00 |
|
|
CitadelStationBot
|
fd9e09d7e6
|
Automatic changelog generation for PR #9912 [ci skip]
|
2019-12-07 02:52:37 -06:00 |
|
|
kevinz000
|
c706720dd1
|
Merge pull request #9912 from Owai-Seek/cargocleanupv2boogaloo
Added 15+ new crates, fixed issues raised in #9901
|
2019-12-07 01:52:35 -07:00 |
|
|
CitadelStationBot
|
5c43a68b71
|
Automatic changelog generation for PR #9932 [ci skip]
|
2019-12-06 20:37:56 -06:00 |
|
|
nik707
|
e4a41c6169
|
Merge pull request #9932 from Putnam3145/fix-genital-contam
Make organs no longer radiaoctively contaminable.
|
2019-12-06 20:37:53 -06:00 |
|
|
Lin
|
602bc57060
|
Merge pull request #10064 from Citadel-Station-13/kevinz000-patch-121
Fixes silicon hearing - "Wow I do good work when I'm not literally spamming reverts without looking, I didn't even make the reverts for the right PRs"
|
2019-12-07 00:51:44 +00:00 |
|
|
Winter Flare
|
6377f1b3a9
|
Organisation
|
2019-12-06 03:42:57 -05:00 |
|
|
kevinz000
|
968e9c099d
|
Update silicon.dm
|
2019-12-06 01:12:44 -07: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 |
|
|
Winter Flare
|
83b77650a8
|
Additional Cleanup
Reorganised Materials, added Bulk Cotton Crate
Removed Wooden Barrel / Toner Crates
Modified Fruit Delux Crate
Modified Cargo Supplies Crate
Moved several crates to their proper areas.
|
2019-12-06 01:13:54 -05:00 |
|
|
CitadelStationBot
|
0598c35d70
|
Automatic changelog generation for PR #10056 [ci skip]
|
2019-12-05 23:16:50 -06: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 |
|
|
CitadelStationBot
|
58e9e6e928
|
Automatic changelog generation for PR #9947 [ci skip]
|
2019-12-05 23:02:40 -06:00 |
|
|
kevinz000
|
b05854ac98
|
Merge pull request #9947 from Iroquois-Pliskin/ClockieSurgeryNerf
Removes Clockie Surgical capabilities
|
2019-12-05 22:02:38 -07:00 |
|
|
CitadelStationBot
|
3825657f5c
|
Automatic changelog generation for PR #10034 [ci skip]
|
2019-12-05 23:00:40 -06: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 |
|
|
CitadelStationBot
|
ad9bc36d1e
|
Automatic changelog generation for PR #10043 [ci skip]
|
2019-12-05 22:58:36 -06:00 |
|
|
kevinz000
|
e16b61b865
|
Merge pull request #10043 from Arturlang/patch-1
PDA cartridges and their contents can no longer be contaminated
|
2019-12-05 21:58:33 -07:00 |
|
|
kevinz000
|
b8bb0f2924
|
Merge pull request #10048 from Ghommie/Ghommie-cit426
Demodularize moodlets.
|
2019-12-05 21:56:29 -07:00 |
|
|
CitadelStationBot
|
9066a36f3a
|
Automatic changelog generation for PR #9955 [ci skip]
|
2019-12-05 22:54:45 -06:00 |
|
|
kevinz000
|
6a305dfe4f
|
Merge pull request #9955 from Ghommie/Ghommie-cit394
Updating supply pods code.
|
2019-12-05 21:54:42 -07:00 |
|
|
Putnam3145
|
6b2d3b116d
|
Merge branch 'master' into Ghommie-cit430
|
2019-12-05 20:53:14 -08:00 |
|
|
kevinz000
|
90f31f5b2b
|
Merge pull request #10023 from Sishen1542/i
meteors now only give 60-90 seconds warning
|
2019-12-05 21:52:32 -07:00 |
|
|
CitadelStationBot
|
8fc5d36911
|
Automatic changelog generation for PR #9919 [ci skip]
|
2019-12-05 22:52:17 -06:00 |
|
|
Lin
|
878a2d65de
|
Merge pull request #9919 from Ghommie/Ghommie-391
Fixes several "behind" layer tail sprites skipping areas normally covered by bodyparts.
|
2019-12-06 04:52:14 +00:00 |
|
|
CitadelStationBot
|
1d02199911
|
Automatic changelog generation for PR #10038 [ci skip]
|
2019-12-05 22:51:33 -06:00 |
|
|
kevinz000
|
a65588009c
|
Merge pull request #10038 from Trilbyspaceclone/patch-240
Makes trash carts craftable with plastic
|
2019-12-05 21:51:30 -07:00 |
|
|
kevinz000
|
f937c4d877
|
Merge pull request #10046 from Ghommie/Ghommie-cit424
Ports flag for bespoke elements.
|
2019-12-05 21:50:19 -07:00 |
|
|
CitadelStationBot
|
b4d20fc98f
|
Automatic changelog generation for PR #10045 [ci skip]
|
2019-12-05 22:49:53 -06:00 |
|
|
kevinz000
|
13f43eb783
|
Merge pull request #10045 from Trilbyspaceclone/patch-241
Makes wallets hold more stuff
|
2019-12-05 21:49:50 -07:00 |
|
|
kevinz000
|
54be35a243
|
Merge pull request #9997 from Sishen1542/nuked
removes superspeed from nuka cola
|
2019-12-05 21:48:34 -07:00 |
|
|
Putnam3145
|
3633c6936d
|
Merge pull request #10052 from Ghommie/Ghommie-cit428
Banishes some "me" emote magic numbers from this realm.
|
2019-12-05 20:47:39 -08:00 |
|
|
CitadelStationBot
|
c8bf77a848
|
Automatic changelog generation for PR #9975 [ci skip]
|
2019-12-05 22:47:32 -06:00 |
|
|
kevinz000
|
b932841adf
|
Merge pull request #9975 from Ghommie/Ghommie-cit404
Merging, tweaking or otherwise removing a few of the stupidest cargo packs.
|
2019-12-05 21:47:29 -07:00 |
|
|
CitadelStationBot
|
1721fb6e7b
|
Automatic changelog generation for PR #10008 [ci skip]
|
2019-12-05 22:46:29 -06:00 |
|
|
Putnam3145
|
62c0d59102
|
Merge pull request #10008 from Seris02/sleepingcarphallucination
adds sleeping carp wrist wrench/violent grab hallucination
|
2019-12-05 20:46:26 -08:00 |
|
|
CitadelStationBot
|
8126d08a7b
|
Automatic changelog generation for PR #9990 [ci skip]
|
2019-12-05 22:45:12 -06:00 |
|
|
kevinz000
|
176bde7829
|
Merge pull request #9990 from Linzolle/strange-reagent
Fixes to strange reagent and very slight nerf I guess.
|
2019-12-05 21:45:09 -07:00 |
|
|
CitadelStationBot
|
c9721a222a
|
Automatic changelog generation for PR #9993 [ci skip]
|
2019-12-05 22:44:28 -06:00 |
|
|
kevinz000
|
5048995a58
|
Merge pull request #9993 from Ghommie/Ghommie-cit412
Ports tgstation loom changes, and durathred golems.
|
2019-12-05 21:44:25 -07:00 |
|
|
CitadelStationBot
|
e47f9007b6
|
Automatic changelog generation for PR #10049 [ci skip]
|
2019-12-05 22:43:27 -06:00 |
|
|
kevinz000
|
e2f9a68c2c
|
Merge pull request #10049 from Useroth/new-tg-plants
Colored fairy grass, because fuck your eyes.
|
2019-12-05 21:43:24 -07:00 |
|
|
CitadelStationBot
|
f2ebf66d76
|
Automatic changelog generation for PR #9805 [ci skip]
|
2019-12-05 22:40:11 -06:00 |
|
|
kevinz000
|
b5595114c1
|
Merge pull request #9805 from Ghommie/Ghommie-cit352
Uplink items are now automatically sorted alphabetically.
|
2019-12-05 21:40:09 -07:00 |
|
|
CitadelStationBot
|
aa31770360
|
Automatic changelog generation for PR #9575 [ci skip]
|
2019-12-05 22:38:33 -06:00 |
|
|
kevinz000
|
fbcdc4d330
|
Merge pull request #9575 from KathrinBailey/Kat'sBoxRework
Box Beautification & Bar Rework & Issue 9706 Fix
|
2019-12-05 21:38:30 -07:00 |
|
|
kevinz000
|
d217a9f445
|
Merge pull request #10032 from Ghommie/Ghommie-cit418
Porting some return type annotations and bad keyword fixes.
|
2019-12-05 21:33:12 -07:00 |
|