AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
kevinz000
|
e1ae3f3c07
|
Merge pull request #10492 from Trilbyspaceclone/plastic__world
Plastic snow
|
2020-01-12 00:49:39 -08:00 |
|
kevinz000
|
f210971889
|
Merge pull request #10393 from chefferz/chefferz-forcefieldstostronk
Significantly lowers the forcefield projector health, lowers armor.
|
2020-01-12 00:47:17 -08:00 |
|
kevinz000
|
60524fb9c7
|
Merge pull request #10416 from r4d6/RCD-Updates
Massive RCD Port & Updates
|
2020-01-12 00:45:21 -08:00 |
|
Putnam3145
|
01db064038
|
Merge pull request #10532 from Ghommie/Ghommie-cit503
A few reagents related fixes.
|
2020-01-12 00:41:00 -08:00 |
|
kevinz000
|
c69d882943
|
Merge pull request #10521 from BlackMajor/master
Fixes roundstart borg spawns, plus a little bit extra.
|
2020-01-12 00:40:48 -08:00 |
|
kevinz000
|
4b4864740b
|
Merge pull request #10522 from Hatterhat/syndi-sleeper
printable syndicate sleepers - this is blackmajors fault im not gonna lie
|
2020-01-12 00:40:17 -08:00 |
|
kevinz000
|
ddff903532
|
Merge pull request #10518 from Seris02/explosionport
ports the explosion rework thingamajig
|
2020-01-12 00:38:43 -08:00 |
|
Ghommie
|
16db38a08f
|
Travis man good
|
2020-01-11 20:51:15 +01:00 |
|
Ghom
|
34502cab1d
|
Merge pull request #10247 from Seris02/atmosfirelock
ATMOS Firelocks and more
|
2020-01-11 15:29:25 +01:00 |
|
Ghom
|
c2b3e7b0ec
|
Merge pull request #10505 from LetterN/beep-boom
better electropack ui
|
2020-01-11 15:21:08 +01:00 |
|
Ghom
|
1f9a7066f0
|
Merge pull request #10445 from Citadel-Station-13/kevinz000-patch-7
Grey Tide spear is now vareditable
|
2020-01-11 15:10:16 +01:00 |
|
Ghom
|
e12f5e9e44
|
Merge pull request #10511 from Citadel-Station-13/kevinz000-patch-15
Fixes health analyzers
|
2020-01-11 15:07:55 +01:00 |
|
Hatterhat
|
b5f8e46941
|
this is blackmajors fault im not gonna lie
|
2020-01-10 23:41:30 -06:00 |
|
BlackMajor
|
30fc5b560b
|
Couple of lingering fixes
|
2020-01-11 17:57:18 +13:00 |
|
Seris02
|
29b66db9e3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into explosionport
|
2020-01-11 11:29:30 +08:00 |
|
Seris02
|
0b0b80f174
|
explosions
|
2020-01-11 11:22:59 +08:00 |
|
Lin
|
fb94bf5fa0
|
Merge pull request #10482 from kappa-sama/modularthing
modular citadel file destruction but only slightly
|
2020-01-11 00:30:58 +00:00 |
|
kevinz000
|
9cec806875
|
Update scanners.dm
|
2020-01-10 12:48:55 -08:00 |
|
kevinz000
|
7392760f38
|
Update scanners.dm
|
2020-01-10 12:48:19 -08:00 |
|
Letter N
|
6ec3fde836
|
better-signalers
|
2020-01-10 18:06:55 +08:00 |
|
Trilbyspaceclone
|
3c877c96f5
|
Update sheet_types.dm
|
2020-01-09 20:42:56 -05:00 |
|
Trilbyspaceclone
|
530d710f57
|
Update mineral.dm
|
2020-01-09 20:42:07 -05:00 |
|
Trilbyspaceclone
|
7df495f4ba
|
Merge branch 'master' into plastic__world
|
2020-01-09 20:41:33 -05:00 |
|
Lin
|
e5e2e4f012
|
Merge pull request #10329 from Ghommie/Ghommie-cit490
Ports reagents id removal and typepath usage.
|
2020-01-10 01:34:39 +00:00 |
|
Lin
|
c4cb06f8f0
|
Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
|
2020-01-10 01:31:20 +00:00 |
|
Ghommie
|
825b4f01c2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-10 02:26:19 +01:00 |
|
Trilbyspaceclone
|
17afb84f94
|
I didnt even touch any maps
|
2020-01-09 05:53:23 -05:00 |
|
TrilbySpaceClone
|
34c6288d22
|
so fantastic!
|
2020-01-09 05:46:30 -05:00 |
|
kappa-sama
|
35353996bd
|
lazy copypaste
|
2020-01-08 16:36:53 -05: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
|
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 |
|
r4d6
|
68e48209da
|
Fix
|
2020-01-07 02:04:06 -05:00 |
|
r4d6
|
20d5e4f480
|
Make the RCD show its upgrades on examination.
And remove a small copy-pasta.
|
2020-01-07 01:45:59 -05:00 |
|
r4d6
|
c3f47e713a
|
Merge branch 'master' into RCD-Updates
|
2020-01-07 00:04:43 -05: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 |
|
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 |
|
Ghommie
|
dcb2ae77fa
|
Porting some runtime fixes.
|
2020-01-06 02:14:25 +01:00 |
|
Ghommie
|
4cc0833b28
|
Fixing an edge case runtime with ore bags.
|
2020-01-06 01:45:53 +01:00 |
|
Ghom
|
e18244671f
|
Merge pull request #10350 from Putnam3145/dojo-ghostrole
Ghost cafe quality-of-life, plus making ghost role eligibility an element
|
2020-01-05 23:05:13 +01:00 |
|
Ghommie
|
592422ee70
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-05 22:53:00 +01:00 |
|
kevinz000
|
0f909a1437
|
Update twohanded.dm
|
2020-01-05 12:50:51 -08:00 |
|
kevinz000
|
4d151b2a7c
|
Update twohanded.dm
|
2020-01-05 11:20:13 -08:00 |
|
kevinz000
|
46cf029a28
|
Update twohanded.dm
|
2020-01-05 11:19:18 -08:00 |
|
Ghom
|
516ec585d2
|
Merge pull request #10435 from Hatterhat/tg-40394
biogenerator can print flour sacks and enzyme now, also some boxes idk
|
2020-01-05 16:22:44 +01:00 |
|
Ghom
|
eeb9ec5f35
|
Merge pull request #10380 from Hatterhat/tg-43000-powerfists
powerfists throw people faster but also leak their gas into the air
|
2020-01-05 15:12:06 +01:00 |
|