Commit Graph

17813 Commits

Author SHA1 Message Date
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 501dfbb43a Merge pull request #9715 from Ghommie/Ghommie-cit316
Ports CEV-Eris resprited matchbox, also respriting cigar boxes myself.
2019-11-10 11:27:36 -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
kevinz000 d47f1f0518 Merge pull request #9756 from Ghommie/Ghommie-cit332
turns on the chat subsystem (#47653)
2019-11-10 11:03:53 -07:00
DeltaFire15 0a27f2266f Merge pull request #2 from Citadel-Station-13/master
master hardsync
2019-11-10 18:04:53 +01: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
DeltaFire 7ab4d2f013 Viva la wehvolution
Adding the plushies code after syncing with ros's changes
2019-11-10 17:39:43 +01:00
DeltaFire15 6c23b0132c Merge pull request #1 from rossark/liz
problem preventionTM
2019-11-10 17:37:28 +01:00
DeltaFire acdf25222a Unga time to sync this with ros's PR so no conflicts 2019-11-10 17:37:15 +01:00
DeltaFire 09aab4f40f description changes 2019-11-10 16:09:24 +01:00
Seris02 2d9f463fd7 fixes a typo 2019-11-10 15:48:40 +08:00
Seris02 99ea3f9b71 more fixes + fixes the last fixes. 2019-11-10 15:09:17 +08:00
Ghommie 03da6d6960 fixeronis. 2019-11-10 06:41:42 +01:00
Ghommie 3ddbee8878 Initial stuff. 2019-11-10 06:30:47 +01:00
Putnam 57fbad5d41 forces antag if all antags are dead 2019-11-09 21:29:09 -08: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
Seris02 7dc22e3ae0 makes rising bass a little less hacky with code 2019-11-10 10:25:23 +08:00
Putnam d78bc94b49 Better logging of why-no-roundstart 2019-11-09 17:34:01 -08:00
Putnam b5c58ec1d8 Weighted antags higher, made zero-antag midround injection chance higher 2019-11-09 16:56:31 -08:00
Putnam 139e9a9da8 reobfuscates dynamic vote 2019-11-09 16:03:40 -08:00
tralezab 354a257641 turns on the chat subsystem (#47653) 2019-11-10 00:05:59 +01:00
Putnam 392e628f3f lowered maximum curve width a good deal 2019-11-09 14:58:38 -08:00
Putnam 3c39fc4df9 i overtuned it. time to go back down 2019-11-09 14:52:47 -08:00
Ghommie 279c22b781 lentext to length. 2019-11-09 23:17:04 +01:00
Ghommie d2b1ce4181 Unused. 2019-11-09 23:05:16 +01:00
Ghommie 9591bb5471 porting "global to static" 2019-11-09 22:53:56 +01:00
Seris02 68014392ca Fixes the fork? 2019-11-09 21:38:17 +08:00
Seris02 8a4197bbf5 Merge branch 'rising_bass' of https://github.com/Seris02/Citadel-Station-13 into rising_bass 2019-11-09 21:15:54 +08:00
Seris02 8dfbc652cb ADDS THE NEW MARTIAL ART - RISING BASS!! 2019-11-09 21:11:36 +08: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 48761a9889 aaa config 2019-11-09 04:19:49 -08:00
Putnam f1801b9531 also pirates 2019-11-09 04:07:48 -08:00
Putnam 68e18ea92f m o r e 2019-11-09 04:07:38 -08:00
Putnam a7302dfbc4 less terrible admin spam 2019-11-09 03:13:37 -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 80448c0abb wow, totally the wrong proc, very cool 2019-11-09 00:40:54 -08:00
Putnam e21d34de78 MORE! MORE! MORE! 2019-11-08 23:19:16 -08:00
Putnam b23b5c02f4 Improved roundstart report flavor 2019-11-08 21:09:37 -08:00
Putnam d10a317b42 Made vote consensus way stronger 2019-11-08 21:09:24 -08:00
Putnam a912c6729f okay none of that i guess 2019-11-08 20:42:58 -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
Trilbyspaceclone 96a8302dac Fine you can boh bomb again 2019-11-08 21:11:44 -05:00
Trilbyspaceclone 5e1ab01733 What do you mean I cant hold the armory on my back?
But mmmmmuuuummmm I want to have 12 duffle bags in my bag of holding!!!
2019-11-08 21:05:30 -05:00
Putnam ac677be4f1 Made the roundstart flavor make a bit more sense. 2019-11-08 16:47:51 -08:00
Putnam b95184ce65 might be better if events actually run 2019-11-08 16:42:01 -08:00