Putnam
|
5e51cc63f9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic
|
2019-11-13 16:58:44 -08:00 |
|
kevinz000
|
4e3147b228
|
Merge pull request #9755 from Ghommie/Ghommie-cit331
lentext to length, yet another 513 requirement.
|
2019-11-12 23:59:31 -07:00 |
|
kevinz000
|
18993c735a
|
Merge pull request #9771 from Ghommie/Ghommie-cit338
Porting Robustin's Syndicate Infiltrator PR from tee-gee
|
2019-11-12 23:58:46 -07:00 |
|
Ghommie
|
2b8b8882fb
|
You are actually rifght, that's bad.
|
2019-11-12 15:49:20 +01:00 |
|
Ghommie
|
a18bcd05d7
|
makes it compile.
|
2019-11-12 02:38:45 +01:00 |
|
Ghommie
|
388a7579b9
|
A few minor clock cult improvements.
|
2019-11-12 01:49:36 +01:00 |
|
Ghommie
|
42d9e3cf51
|
Porting Robustin's Syndicate Infiltrator PR
|
2019-11-11 18:49:18 +01:00 |
|
Putnam
|
2120526525
|
Merged upstream dynamic fixes ported by Ghommie.
|
2019-11-10 18:48:59 -08:00 |
|
kevinz000
|
c4849ead74
|
Merge pull request #9727 from BlackMajor/Yeehaw
Fixes ED209 Assemblies sometimes advancing to an invalid build stage.
|
2019-11-10 11:46:03 -07:00 |
|
kevinz000
|
39e55edcb3
|
Merge pull request #9734 from Ghommie/Ghommie-cit324
Ports CEV-eris delivery packages sprites, also dunking old syndie cybernetics box sprite.
|
2019-11-10 11:45:47 -07:00 |
|
kevinz000
|
07447917de
|
Merge pull request #9744 from Seris02/meteorhallucinations
makes meteor hallucinations have an ETA now
|
2019-11-10 11:44:41 -07:00 |
|
kevinz000
|
95b98a5133
|
Merge pull request #9746 from Ghommie/Ghommie-cit328
Ports "Cleans up the new alt clicking functionality" from /tg/
|
2019-11-10 11:43:41 -07:00 |
|
kevinz000
|
48fb3a0f08
|
Merge pull request #9694 from kappa-sama/hosnowflake
Buffs security, nerfs antags
|
2019-11-10 11:40:41 -07:00 |
|
kevinz000
|
92455b5b8c
|
Merge pull request #9695 from Ghommie/Ghommie-cit311
Unmodularize and update pAI/Intellicards very slighty.
|
2019-11-10 11:40:14 -07:00 |
|
kevinz000
|
814321beeb
|
Merge pull request #9696 from Ghommie/Ghommie-cit312
clock welder overlay fix.
|
2019-11-10 11:39:54 -07:00 |
|
kevinz000
|
d1f6483687
|
Merge pull request #9704 from Ghommie/Ghommie-cit314
Minor ninja tweaks and stealth nerf.
|
2019-11-10 11:31:25 -07:00 |
|
kevinz000
|
e0626d12b1
|
Merge pull request #9707 from BonniePandora/Weldhelmets
Port Welding Hard Hats from /tg/
|
2019-11-10 11:30:54 -07:00 |
|
kevinz000
|
487e1806e7
|
Merge pull request #9709 from Trilbyspaceclone/cargo_memes_3
Adds 8 more sci crates to cargo
|
2019-11-10 11:30:33 -07:00 |
|
kevinz000
|
7b6604108f
|
Merge pull request #9713 from Trilbyspaceclone/sprite-issues
Makes catnip have sprites
|
2019-11-10 11:28:49 -07:00 |
|
kevinz000
|
23cd6b7604
|
Merge pull request #9714 from Ghommie/Ghommie-cit315
Fixing a few throw_at calls and modular computer processors Init.
|
2019-11-10 11:28:26 -07:00 |
|
kevinz000
|
1493863533
|
Merge pull request #9716 from Ghommie/Ghommie-cit317
Porting objective code refactor (ergo fixing abductors/abductees objective by updating the code)
|
2019-11-10 11:27:04 -07:00 |
|
kevinz000
|
c46b425402
|
Merge pull request #9719 from Ghommie/Ghommie-cit318
Renames is_hot and is_sharp to get_temperature and get_sharpness, just like how ol tg did.
|
2019-11-10 11:26:06 -07:00 |
|
kevinz000
|
4fc10d436d
|
Merge pull request #9721 from Ghommie/Ghommie-cit319
Unmodularize secway and turfs
|
2019-11-10 11:25:50 -07:00 |
|
kevinz000
|
3570df6084
|
Merge pull request #9726 from Ghommie/Ghommie-cit323
Fixing several minor runtimes.
|
2019-11-10 11:10:16 -07:00 |
|
Ghommie
|
c6e44a7fed
|
That's it: #46027, (a little bit of) #46132, #47100, #47341, #47351, #47395, #47457, #47491.
|
2019-11-10 17:59:40 +01:00 |
|
BlackMajor
|
2c9af44ce3
|
Merge pull request #9724 from Ghommie/Ghommie-cit322
Fixes free real estate paraplegic trait and bolas.
|
2019-11-10 17:10:45 +13:00 |
|
Ghommie
|
279c22b781
|
lentext to length.
|
2019-11-09 23:17:04 +01:00 |
|
Putnam
|
fdcc4af303
|
mm, yes, compile BEFORE committing
|
2019-11-09 04:40:25 -08:00 |
|
Putnam
|
6de835f5e3
|
Assassination is less likely at lower threats.
|
2019-11-09 04:39:14 -08:00 |
|
Putnam
|
68e18ea92f
|
m o r e
|
2019-11-09 04:07:38 -08:00 |
|
Putnam
|
428ea5e5e1
|
Nuke disk being still now generates threat
|
2019-11-09 03:12:36 -08:00 |
|
Putnam
|
d0d469a45a
|
Better roundend logging
|
2019-11-09 01:00:35 -08:00 |
|
Putnam
|
be464a38b1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic
|
2019-11-08 20:37:29 -08:00 |
|
Putnam
|
cfcf89ebf1
|
Dynamic controls lots of events now (when active)!
|
2019-11-08 15:44:38 -08:00 |
|
Ghommie
|
297ee03175
|
Ports "Cleans up the new alt clicking functionality" from /tg/
|
2019-11-08 19:25:09 +01:00 |
|
Putnam
|
825ef80b9d
|
started transferring some events from events to dynamic antags
|
2019-11-08 06:33:31 -08:00 |
|
Seris02
|
a5a483fb8a
|
makes meteor hallucinations have an ETA now
|
2019-11-08 19:55:27 +08:00 |
|
Putnam
|
912ca97d29
|
Added a preference that auto-votes at extremely low weight.
|
2019-11-08 03:44:22 -08:00 |
|
Putnam
|
d795df1150
|
made warops part of the dynamic system, in dynamic
|
2019-11-07 23:39:17 -08:00 |
|
Putnam
|
aab2c4cd3c
|
Added logging to wizard/traitor extra threat spending.
|
2019-11-07 20:34:02 -08:00 |
|
BlackMajor
|
aaff0bf9e7
|
Merge pull request #9705 from kappa-sama/patch-4
thanks major
|
2019-11-08 14:17:59 +13:00 |
|
BlackMajor
|
a6bbe75c36
|
Merge pull request #9611 from Citadel-Station-13/supply-passive-gen
Adds passive point generation to cargo. Nerfs miasma selling. Increases mindshield crate price.
|
2019-11-08 14:17:17 +13:00 |
|
Putnam
|
34015969e8
|
changed misleading message
|
2019-11-07 16:35:40 -08:00 |
|
Putnam
|
58603140f9
|
wow, .len, very cool
|
2019-11-06 22:03:18 -08:00 |
|
Putnam
|
eb9c8c9aca
|
made glorious death spend threat
|
2019-11-06 18:07:39 -08:00 |
|
Putnam
|
3bdbb04ea2
|
Made hijack require threat threshold, spend threat
|
2019-11-06 17:31:39 -08:00 |
|
Putnam
|
aacb928def
|
Merge branch 'wizard-dynamic' into super-special-awesome-dynamic
|
2019-11-06 16:29:42 -08:00 |
|
Putnam
|
f3afc5de1b
|
Merge branch 'malf-dynamic' into super-special-awesome-dynamic
|
2019-11-06 16:03:04 -08:00 |
|
Ghommie
|
ae6e50b081
|
resprited delivery packages.
|
2019-11-06 18:27:33 +01:00 |
|
Putnam
|
97493690d3
|
hmm, also important
|
2019-11-06 01:34:36 -08:00 |
|