Ghom
|
ce2fc37df3
|
Merge pull request #10501 from Putnam3145/more-atmos
Adds a couple relief valves
|
2020-01-18 20:16:30 +01:00 |
|
CitadelStationBot
|
e9f626dd59
|
Automatic changelog generation for PR #10600 [ci skip]
|
2020-01-18 11:52:17 -06:00 |
|
Ghom
|
9f2bc48d74
|
Merge pull request #10600 from Kraseo/ricetriangles
Fixes sprinkles on jelly donuts + lack of berry juice
|
2020-01-18 18:52:14 +01:00 |
|
CitadelStationBot
|
f1ea68c977
|
Automatic changelog generation for PR #10580 [ci skip]
|
2020-01-18 10:47:34 -06:00 |
|
Ghom
|
07b3bac674
|
Merge pull request #10580 from Putnam3145/craft-log
Craft logging
|
2020-01-18 17:47:31 +01:00 |
|
CitadelStationBot
|
bbe5b0e281
|
Automatic changelog generation for PR #10586 [ci skip]
|
2020-01-18 10:42:32 -06:00 |
|
Ghom
|
c00be1a9b1
|
Merge pull request #10586 from Tupinambis/RLDNerf
Nerfs RLDs because they hard counter nightmares and night ops.
|
2020-01-18 17:42:30 +01:00 |
|
Ghom
|
29c3e72335
|
You jelly.
|
2020-01-18 17:41:31 +01:00 |
|
CitadelStationBot
|
c7907e9173
|
Automatic changelog generation for PR #10481 [ci skip]
|
2020-01-18 09:56:34 -06:00 |
|
Ghom
|
0a1277c28f
|
Merge pull request #10481 from dapnee/BEEES
Updates Science Uniform and Accessories
|
2020-01-18 16:56:31 +01:00 |
|
CitadelStationBot
|
ea3d6a1977
|
Automatic changelog generation for PR #10599 [ci skip]
|
2020-01-18 09:54:55 -06:00 |
|
Ghom
|
5a613809f5
|
Merge pull request #10599 from Putnam3145/gibtonite-explosion-fix
Fixed gibtonite instantly exploding on pick mining
|
2020-01-18 16:54:52 +01:00 |
|
Kraseo
|
6708607073
|
fixes jelly donuts not having sprinkle sprites, fixes jelly donuts not having berry jelly
|
2020-01-18 15:05:07 +01:00 |
|
Putnam
|
b30948a60a
|
Fixed gibtonite instantly exploding on pick mining
|
2020-01-18 04:37:44 -08:00 |
|
Dap
|
c13a5687d6
|
HOW MANY TIMES DO I GOTTA SCREAM AT YOU TO MERGE THIS OLD MAN
|
2020-01-18 02:53:03 -07:00 |
|
Dap
|
28c9700308
|
Merge remote-tracking branch 'upstream/master' into BEEES
|
2020-01-18 02:27:15 -07:00 |
|
Putnam
|
6d4f400f5c
|
updated the tgui file for the conflict
|
2020-01-17 21:34:41 -08:00 |
|
Putnam
|
3788bc6676
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos
|
2020-01-17 21:33:13 -08:00 |
|
kevinz000
|
fd440ac379
|
Merge pull request #10592 from Ghommie/Ghommie-cit508
Kevinz let some files fall back to CRLF.
|
2020-01-17 17:34:13 -07:00 |
|
CitadelStationBot
|
61804e4147
|
Automatic changelog generation for PR #10579 [ci skip]
|
2020-01-17 18:32:32 -06:00 |
|
Ghom
|
f848b58f2c
|
Merge pull request #10579 from r4d6/map-fix
Fix Cyborgs spawns on all maps
|
2020-01-18 01:32:29 +01:00 |
|
CitadelStationBot
|
201f234364
|
Automatic changelog generation for PR #10591 [ci skip]
|
2020-01-17 18:25:37 -06:00 |
|
Ghom
|
da8b29dd23
|
Merge pull request #10591 from Citadel-Station-13/kevinz000-patch-12
Removes blood duplication via virus mix
|
2020-01-18 01:25:34 +01:00 |
|
Ghommie
|
eaff51ff40
|
Kevinz let some files fall back to CRLF.
|
2020-01-17 23:26:05 +01:00 |
|
CitadelStationBot
|
eb3597ecc3
|
Automatic changelog generation for PR #10125 [ci skip]
|
2020-01-17 16:15:12 -06:00 |
|
kevinz000
|
aea0de30d1
|
Merge pull request #10125 from Ghommie/Ghommie-cit449
Ports a few projectile code updates by ke:b:inz.
|
2020-01-17 15:15:08 -07:00 |
|
CitadelStationBot
|
32c496f70e
|
Automatic changelog generation for PR #10570 [ci skip]
|
2020-01-17 15:34:40 -06:00 |
|
Ghom
|
34872f6969
|
Merge pull request #10570 from kevinz000/map_network_helpers
Power cable + atmos pipe auto mapping helpers
|
2020-01-17 22:34:38 +01:00 |
|
kevinz000
|
eddb6fda68
|
Update others.dm
|
2020-01-17 14:32:51 -07:00 |
|
kevinz000
|
3c2e6a959d
|
whitespace renormalize
|
2020-01-17 14:25:29 -07:00 |
|
CitadelStationBot
|
7c3d671eb1
|
Automatic changelog generation for PR #10569 [ci skip]
|
2020-01-17 15:24:15 -06:00 |
|
kevinz000
|
05e2b6a441
|
Merge pull request #10569 from keronshb/RemoteMoodResearch
Ports the Nanite Remote, Nanite Mood Programs + Rebalance, and the Research Generating Nanites
|
2020-01-17 14:24:13 -07:00 |
|
kevinz000
|
edccfa3523
|
Update others.dm
|
2020-01-17 14:15:08 -07:00 |
|
kevinz000
|
e69253bf87
|
Update others.dm
|
2020-01-17 14:12:51 -07:00 |
|
Tupinambis
|
22dbd3d265
|
Nerfs RLDs in general. You know I had to do it to em.
|
2020-01-17 12:23:13 -06:00 |
|
CitadelStationBot
|
541a9cf9e7
|
Automatic changelog generation for PR #10375 [ci skip]
|
2020-01-17 10:36:45 -06:00 |
|
Ghom
|
72a83f05b5
|
Merge pull request #10375 from r4d6/radsuit
Add a Radiation Hardsuit
|
2020-01-17 17:36:43 +01:00 |
|
CitadelStationBot
|
1a604e6d9e
|
Automatic changelog generation for PR #10584 [ci skip]
|
2020-01-17 10:16:39 -06:00 |
|
Ghom
|
eaca04a1c2
|
Merge pull request #10584 from AffectedArc07/patch-1
Hotfix for CI line endings
|
2020-01-17 17:16:36 +01:00 |
|
AffectedArc07
|
835500980b
|
Hotfix for CI line endings
|
2020-01-17 16:00:15 +00:00 |
|
CitadelStationBot
|
7c77e30a2e
|
Automatic changelog generation for PR #10582 [ci skip]
|
2020-01-17 07:44:07 -06:00 |
|
Ghom
|
e7b925e779
|
Merge pull request #10582 from Putnam3145/more_flavor
Made temp flavor "more" pop up with actual temp flavor
|
2020-01-17 14:44:04 +01:00 |
|
Putnam
|
5ace1df9af
|
better logging, that also works
|
2020-01-16 19:09:13 -08:00 |
|
Putnam
|
a4cc73f219
|
some craft logging
|
2020-01-16 18:40:00 -08:00 |
|
r4d6
|
98bb9397ea
|
fix cyborgs spawns
|
2020-01-16 21:05:51 -05:00 |
|
Ghom
|
c1e9618757
|
Merge pull request #10565 from Citadel-Station-13/revert-10379-tg-47443-shotgunpbs
Revert "shotgun pointblanking people actually throws them"
|
2020-01-16 23:18:37 +01:00 |
|
CitadelStationBot
|
1860d553e4
|
Automatic changelog generation for PR #10347 [ci skip]
|
2020-01-16 15:51:40 -06:00 |
|
kevinz000
|
d110d7bae9
|
Merge pull request #10347 from deathride58/stambufferbuff
[experimental] Buffs the stamina buffer by making it recharge for free.
|
2020-01-16 14:51:38 -07:00 |
|
keronshb
|
4dc85dd4ef
|
the compile file for this
|
2020-01-16 16:28:11 -05:00 |
|
keronshb
|
69b5164103
|
Merge branch 'master' into RemoteMoodResearch
|
2020-01-16 15:50:11 -05:00 |
|