 Putnam
|
8df9a051ec
|
it compiles now, ready for testmerge probs
|
2020-01-27 19:09:04 -08:00 |
|
|
Putnam
|
233aeaa456
|
removed some suggested bad possible contraband
|
2020-01-26 19:03:09 -08:00 |
|
|
Putnam
|
37777c4cc7
|
Removed the wirecutting one
|
2020-01-25 13:37:40 -08:00 |
|
|
Putnam
|
c58b4daa35
|
collectors too
this doesn't compile but like. it's a draft
|
2020-01-24 11:58:58 -08:00 |
|
|
Putnam
|
847b3c0a09
|
Fixed flavor objectives and added more.
|
2020-01-24 10:46:07 -08:00 |
|
|
Putnam
|
815b4f033d
|
made flavor things a game option + more hoard
|
2020-01-20 04:13:54 -08:00 |
|
|
Putnam
|
dfaa3bf15c
|
Added another flavor obj, "horde" to "hoard"
|
2020-01-20 03:46:44 -08:00 |
|
|
Putnam
|
67c2fdca52
|
more flavor objectives
|
2020-01-20 01:20:42 -08:00 |
|
|
Putnam
|
8e674817a9
|
errors
|
2020-01-20 00:30:18 -08:00 |
|
|
Putnam
|
06c66617e6
|
m o r e traitor objectives
|
2020-01-19 18:58:10 -08:00 |
|
|
Putnam
|
bc5646f8b1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul
|
2020-01-19 00:56:17 -08:00 |
|
|
Putnam
|
5eba760aa8
|
Reworked survivalist
|
2020-01-18 22:07:54 -08:00 |
|
|
Putnam
|
e1cf63e0ac
|
Greentext tweaked
|
2020-01-18 21:32:42 -08:00 |
|
|
Putnam
|
d287835d14
|
Made quirk blacklisting antag-sided
|
2020-01-18 21:29:27 -08:00 |
|
|
GhomandGitHub
|
0a5e2cf8ff
|
Merge pull request #10601 from Putnam3145/dojo-hilbert
Adds 16777216 dorms to the ghost dojo
|
2020-01-19 03:02:32 +01:00 |
|
|
CitadelStationBot
|
4d06c2d2d3
|
Automatic changelog generation for PR #10568 [ci skip]
|
2020-01-18 15:13:26 -06:00 |
|
|
GhomandGitHub
|
2147a2024f
|
Merge pull request #10568 from r4d6/Passive-Vents
Add passive vents
|
2020-01-18 22:13:23 +01:00 |
|
|
r4d6
|
4e6ad84317
|
Fix conflict
|
2020-01-18 16:05:56 -05:00 |
|
|
r4d6
|
810556cbb7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Passive-Vents
|
2020-01-18 16:03:49 -05:00 |
|
|
CitadelStationBot
|
bb6101f9a3
|
Automatic changelog generation for PR #10571 [ci skip]
|
2020-01-18 14:46:19 -06:00 |
|
|
LinandGitHub
|
760bbfa8b6
|
Merge pull request #10571 from Ghommie/Ghommie-cit507
Riot foam dart design cost consistency.
|
2020-01-18 20:46:16 +00:00 |
|
|
CitadelStationBot
|
0cc3795f15
|
Automatic changelog generation for PR #10578 [ci skip]
|
2020-01-18 13:32:17 -06:00 |
|
|
GhomandGitHub
|
d709edb1c2
|
Merge pull request #10578 from r4d6/Mining
Port TG's Mining changes
|
2020-01-18 20:32:14 +01:00 |
|
|
CitadelStationBot
|
0bc10319d9
|
Automatic changelog generation for PR #10501 [ci skip]
|
2020-01-18 13:16:32 -06:00 |
|
|
GhomandGitHub
|
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 |
|
|
GhomandGitHub
|
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 |
|
|
GhomandGitHub
|
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 |
|
|
GhomandGitHub
|
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 |
|
|
GhomandGitHub
|
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 |
|
|
GhomandGitHub
|
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 |
|
|
GhomandGitHub
|
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 |
|
|
Putnam
|
133cb89b32
|
hilbert's hotel for ghost dojo
|
2020-01-18 06:55:26 -08: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 |
|
|
r4d6
|
0d3706b7f9
|
Make public shuttle not require access
|
2020-01-17 22:15:29 -05:00 |
|
|
r4d6
|
4e114d399c
|
Readding Cryo Sleeper in the gulag
|
2020-01-17 22:13:19 -05:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
GhomandGitHub
|
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 |
|
|
GhomandGitHub
|
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 |
|