 Putnam
|
3d9e84a3f8
|
Tweaks and fixes
|
2020-02-01 00:23:45 -08:00 |
|
|
Putnam
|
425f532f76
|
WHOOPS
|
2020-01-31 13:12:50 -08:00 |
|
|
Putnam
|
809f57a15d
|
also added kill-once objectives
|
2020-01-31 12:25:19 -08:00 |
|
|
Putnam
|
29e0ac52c4
|
fuzzy objectives
|
2020-01-31 11:52:05 -08:00 |
|
|
Putnam
|
d358913bde
|
linter is right, whoops
|
2020-01-28 17:26:32 -08:00 |
|
|
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 |
|
|
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 |
|
|
Ghom
|
d709edb1c2
|
Merge pull request #10578 from r4d6/Mining
Port TG's Mining changes
|
2020-01-18 20:32:14 +01:00 |
|
|
Ghom
|
ce2fc37df3
|
Merge pull request #10501 from Putnam3145/more-atmos
Adds a couple relief valves
|
2020-01-18 20:16:30 +01:00 |
|
|
Ghom
|
07b3bac674
|
Merge pull request #10580 from Putnam3145/craft-log
Craft logging
|
2020-01-18 17:47:31 +01: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
|
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
|
b30948a60a
|
Fixed gibtonite instantly exploding on pick mining
|
2020-01-18 04:37:44 -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
|
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 |
|
|
Tupinambis
|
22dbd3d265
|
Nerfs RLDs in general. You know I had to do it to em.
|
2020-01-17 12:23:13 -06: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
|
ce16c91b2f
|
Code changes
|
2020-01-16 14:08:14 -05:00 |
|
|
Ghom
|
7d9f4f9fe5
|
Merge pull request #10417 from kevinz000/nightshift_1
Nightshift improvements: public area settings/levels, nightshift auth requirement change, config changes, etc etc
|
2020-01-16 03:21:49 +01:00 |
|
|
r4d6
|
755b0fac3c
|
Merge branch 'master' into Passive-Vents
|
2020-01-15 19:15:50 -05:00 |
|
|
r4d6
|
6045d818d8
|
Add passive vents
|
2020-01-15 19:12:13 -05:00 |
|
|
Ghom
|
8a06f2f45c
|
Merge pull request #10499 from Hatterhat/tg-40046
more /tg/station ports - tools! logging! some other fun stuff!
|
2020-01-15 01:05:36 +01:00 |
|
|
Ghom
|
5dee355381
|
Merge pull request #10530 from kappa-sama/modularer
deletes modular items but this time i don't get cucked
|
2020-01-15 00:47:38 +01:00 |
|
|
Ghom
|
11cb7357c5
|
Stop web-editing like that, little one.
|
2020-01-14 16:22:41 +01:00 |
|
|
kappa-sama
|
17604a672d
|
epic
|
2020-01-14 09:04:35 -05:00 |
|
|
Putnam
|
21dde64da2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into chemistry-aaa
|
2020-01-14 03:27:03 -08:00 |
|
|
Hatterhat
|
464b893790
|
Merge branch 'master' into tg-40046
|
2020-01-13 23:06:48 -06:00 |
|
|
kappa-sama
|
3f57f30e14
|
Merge branch 'master' into modularer
|
2020-01-13 16:32:00 -05:00 |
|
|
Lin
|
623ab1c661
|
Merge pull request #10287 from Ghommie/Ghommie-cit492
Minor captains closet cleanup.
|
2020-01-13 21:15:42 +00:00 |
|
|
Letter N
|
6ace5fc4b3
|
ell eff
|
2020-01-13 21:19:21 +08:00 |
|
|
Letter N
|
450cb2b01a
|
Merge branch 'master' into banjo
|
2020-01-13 20:53:30 +08:00 |
|
|
kevinz000
|
8f5d4a0a49
|
Merge remote-tracking branch 'citadel/master' into nightshift_1
|
2020-01-12 18:27:03 -08:00 |
|
|
Ghommie
|
9dad810edf
|
Merge branch 'Ghommie-cit492' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit492
|
2020-01-12 23:11:02 +01:00 |
|
|
Ghommie
|
b2ab8959f6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit492
|
2020-01-12 23:00:05 +01:00 |
|
|
kappa-sama
|
3e199ed780
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into modularer
|
2020-01-12 14:23:38 -05:00 |
|
|
kappa-sama
|
4e3a5379a4
|
augh
|
2020-01-12 14:21:06 -05:00 |
|
|
Hatterhat
|
83f8e42fb3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40046
|
2020-01-12 12:37:19 -06:00 |
|