 kappa-sama
|
ebf8d048fd
|
perhaps?
|
2020-01-08 16:42:16 -05:00 |
|
|
kappa-sama
|
c88f58bb67
|
hm
|
2020-01-08 16:41:44 -05:00 |
|
|
kappa-sama
|
a4da8a2dc4
|
bye
|
2020-01-08 16:37:38 -05:00 |
|
|
kappa-sama
|
35353996bd
|
lazy copypaste
|
2020-01-08 16:36:53 -05:00 |
|
|
kappa-sama
|
ff069ecde2
|
e
|
2020-01-08 10:00:46 -05:00 |
|
|
kappa-sama
|
ba20618bd0
|
this file does literally nothing
|
2020-01-08 10:00:33 -05:00 |
|
|
kappa-sama
|
d0cd6ae336
|
begone
|
2020-01-08 09:48:04 -05:00 |
|
|
kappa-sama
|
0bbacca4aa
|
e
|
2020-01-08 09:47:55 -05:00 |
|
|
kappa-sama
|
933916a386
|
e
|
2020-01-08 09:46:58 -05:00 |
|
|
kappa-sama
|
3dac4e568d
|
begone
|
2020-01-08 09:45:49 -05:00 |
|
|
kappa-sama
|
af07c4354e
|
e
|
2020-01-08 09:45:38 -05:00 |
|
|
kappa-sama
|
b3e916cc68
|
e
|
2020-01-08 09:44:16 -05:00 |
|
|
kappa-sama
|
c09d8f2319
|
Merge pull request #26 from Citadel-Station-13/master
bazinga
|
2020-01-08 09:43:00 -05:00 |
|
|
CitadelStationBot
|
e5220dbd29
|
Automatic changelog generation for PR #10474 [ci skip]
|
2020-01-08 06:48:15 -06:00 |
|
|
Ghom
|
f263a3ea31
|
Merge pull request #10474 from Putnam3145/fix-traitor-again
[s] Fixes traitors
|
2020-01-08 13:48:12 +01:00 |
|
|
Putnam
|
a97fa8f81a
|
also made objectives deletable
|
2020-01-07 18:01:24 -08:00 |
|
|
Putnam
|
26064e0992
|
crap
|
2020-01-07 17:37:57 -08:00 |
|
|
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
|
c4dd0a393a
|
Revert "Test"
This reverts commit 5414f09b80.
|
2020-01-08 13:38:35 +13:00 |
|
|
BlackMajor
|
3424862746
|
Revert "Adds borg spawns to every map, and fixes a shit load of null vars on them."
This reverts commit cfb553b828.
|
2020-01-08 13:38:25 +13:00 |
|
|
BlackMajor
|
8aaa6db732
|
Revert "Test"
This reverts commit 8746e6091d.
|
2020-01-08 13:38:17 +13:00 |
|
|
BlackMajor
|
0520d3d9b9
|
Revert "Conflcits are pretty bothersome I tell ya hwat"
This reverts commit e6f11aa275.
|
2020-01-08 13:38:10 +13:00 |
|
|
BlackMajor
|
e6f11aa275
|
Conflcits are pretty bothersome I tell ya hwat
|
2020-01-08 13:20:24 +13:00 |
|
|
BlackMajor
|
7ddc356a6f
|
Revert "Test 2"
This reverts commit 6670de8e64.
|
2020-01-08 13:19:33 +13:00 |
|
|
BlackMajor
|
6670de8e64
|
Test 2
|
2020-01-08 13:19:07 +13:00 |
|
|
BlackMajor
|
8746e6091d
|
Test
|
2020-01-08 13:17:49 +13:00 |
|
|
BlackMajor
|
cfb553b828
|
Adds borg spawns to every map, and fixes a shit load of null vars on them.
|
2020-01-08 12:37:31 +13:00 |
|
|
BlackMajor
|
5414f09b80
|
Test
|
2020-01-08 12:29:45 +13: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 |
|
|
BlackMajor
|
8ebd698763
|
Give my lad Blade mining borg a rest sprite
|
2020-01-07 23:14:07 +13:00 |
|
|
CitadelStationBot
|
c39862711a
|
Automatic changelog generation for PR #10420 [ci skip]
|
2020-01-06 21:46:45 -06:00 |
|
|
kevinz000
|
4599abde4a
|
Merge pull request #10420 from MrJWhit/radiation-plasma-usage
Increase radiation plasma usage in radiation collector
|
2020-01-06 19:46:42 -08:00 |
|
|
CitadelStationBot
|
bbc8785f5e
|
Automatic changelog generation for PR #10439 [ci skip]
|
2020-01-06 21:45:31 -06:00 |
|
|
kevinz000
|
f6b9396096
|
Merge pull request #10439 from LetterN/tachelon-logs
doppler logs
|
2020-01-06 19:45:28 -08:00 |
|
|
BlackMajor
|
5a97259ba9
|
Fix a couple of bugs, add wrapping paper and destination tagger
|
2020-01-07 15:33:16 +13:00 |
|
|
Lin
|
2ce3b7fbf5
|
Merge pull request #10455 from Ghommie/Ghommie-cit501
Porting some runtime fixes.
|
2020-01-07 01:00:25 +00:00 |
|
|
Lin
|
da43d336c3
|
Merge pull request #10047 from Ghommie/Ghommie-cit425
Turns dog/cat petting into an element datum.
|
2020-01-07 00:55:19 +00:00 |
|
|
CitadelStationBot
|
7d4a52a91c
|
Automatic changelog generation for PR #9878 [ci skip]
|
2020-01-06 18:31:26 -06:00 |
|
|
Lin
|
718d4a080d
|
Merge pull request #9878 from Ghommie/Ghommie-cit382
Unmodularize several machinery and structures
|
2020-01-07 00:31:24 +00:00 |
|
|
Lin
|
46420a693d
|
Merge branch 'master' into Ghommie-cit425
|
2020-01-07 00:28:37 +00:00 |
|
|
CitadelStationBot
|
201a2056b9
|
Automatic changelog generation for PR #10384 [ci skip]
|
2020-01-06 14:47:18 -06:00 |
|
|
Ghom
|
d07d436ba2
|
Merge pull request #10384 from Hatterhat/tg-43454-43688-the-one-with-the-cargo
cargo tweaks, new shit, why do digitigrade sprites exist
|
2020-01-06 21:47:15 +01:00 |
|
|
CitadelStationBot
|
9006412a6a
|
Automatic changelog generation for PR #10401 [ci skip]
|
2020-01-06 01:08:52 -06:00 |
|
|
Putnam3145
|
3b6cf8c952
|
Merge pull request #10401 from r4d6/SM
Add three more Supermatter Engine variation for Box
|
2020-01-05 23:08:49 -08:00 |
|
|
CitadelStationBot
|
2533af0cfe
|
Automatic changelog generation for PR #10437 [ci skip]
|
2020-01-05 21:49:54 -06:00 |
|
|
Lin
|
7ad6021472
|
Merge pull request #10437 from Ghommie/Ghommie-cit497
Fixes roundstart mushpeople being unable to MUSH PUUUUUUUUUUUUNCH!!
|
2020-01-06 03:49:52 +00:00 |
|
|
Ghommie
|
dcb2ae77fa
|
Porting some runtime fixes.
|
2020-01-06 02:14:25 +01:00 |
|