Commit Graph
5927 Commits
Author SHA1 Message Date
Thalpy 00bffba7ea Why do surgeries always end up with jank 2019-11-21 15:57:21 +00:00
Useroth 2ced7db508 Ported a bunch of tg hydroponic stuff. 2019-11-21 10:53:57 +01:00
Unknown 71b3b8fdc6 Ports/Adds new Berets
Ports some berets adds even more to most jobs
2019-11-20 22:21:20 -07:00
kevinz000andGitHub c22ae596fc Merge pull request #9880 from Putnam3145/meteor-random-fix
Makes sure every dynamic-triggered event isn't random on dynamic
2019-11-20 22:12:42 -07:00
kevinz000andGitHub 1efd3ae395 Merge pull request #9866 from Useroth/tatorstrangeseeds
Adds strange seeds as a buyable traitor botanist item.
2019-11-20 22:09:53 -07:00
Seris02 60def2a9fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix 2019-11-21 13:08:23 +08:00
kevinz000andGitHub 42de0d5ebe Merge pull request #9831 from Putnam3145/dynamic-nukeops-pop-fix
Makes dynamic nukeops population scaling more like secret
2019-11-20 22:01:49 -07:00
kevinz000andGitHub 540a57b518 Merge pull request #9828 from Putnam3145/dynamic-meteor-nonrepeat
Makes meteor not repeatable in dynamic.
2019-11-20 21:53:05 -07:00
kevinz000andGitHub 8df8acb1b7 Merge pull request #9811 from Ghommie/Ghommie-cit353
Dreamchecker compatibility changes, part 2.
2019-11-20 21:49:58 -07:00
kevinz000andGitHub c503e564db Merge pull request #9873 from Ghommie/Ghommie-cit378
Fixing aux-base construction RCD door access settings menu and reverting another non-functional bit
2019-11-20 21:48:41 -07:00
kevinz000andGitHub 4b41a70e13 Merge pull request #9875 from Putnam3145/required-candidates-works-now
Makes from-ghosts rulesets cancel if fewer than required candidates
2019-11-20 21:47:48 -07:00
kevinz000andGitHub 95951add5c Merge pull request #9870 from Ghommie/Ghommie-cit377
Moves some clockie paper info to the right file.
2019-11-20 21:43:35 -07:00
FermiandFermi b911fabb37 Okay bedtime 2019-11-21 04:25:25 +00:00
GrayRachnid 4ae76cf1d9 WHY
D
2019-11-20 23:11:46 -05:00
FermiandFermi b90213882e Again with the rouge 2019-11-21 03:58:16 +00:00
FermiandFermi 01f465dc8c Scanner formatting 2019-11-21 03:52:00 +00:00
Ghommie 2e55495557 ayy 2019-11-21 04:48:42 +01:00
Ghommie 399a5080da Fixing cyborg camera interaction for real 2019-11-21 04:42:49 +01:00
FermiandFermi 18e1246fd0 Classic fixes 2019-11-21 03:16:18 +00:00
Putnam 435d2f893e Makes roundend threat log only show actual changes. 2019-11-20 18:31:39 -08:00
FermiandFermi cc53a0061f Well it compiles 2019-11-21 02:15:58 +00:00
Putnam afc137f0a3 Reverted making latejoiners count for roundstart rulesets 2019-11-20 17:16:57 -08:00
GrayRachnid 48d1bd1160 fixes goldbox 2019-11-20 18:47:35 -05:00
FermiandFermi a4d61f8571 Okay last tweak I'm seriously gonna stop 2019-11-20 21:44:02 +00:00
FermiandFermi bfb5f75016 Finishing up final UI adjustments 2019-11-20 21:23:54 +00:00
FermiandFermi b62892ab1d Allows purge of synthchems. 2019-11-20 17:46:06 +00:00
Ghommie ac44bfcad2 chem dispenser beakers and bikehorn fixes. 2019-11-20 17:55:11 +01:00
Useroth e2c8efa824 Oopsie. I need to stop committing code without comipiling. 2019-11-20 15:36:55 +01:00
Useroth 2a8152c835 Applied suggestions. 2019-11-20 15:15:10 +01:00
Thalpy 3bf10ba575 Syncs size 2 revengance 2019-11-20 13:56:02 +00:00
FermiandFermi 363f0b2df7 All good 2019-11-20 12:44:33 +00:00
FermiandFermi cac69eb158 Minor ID oops 2019-11-20 12:28:17 +00:00
FermiandFermi a0fe4c74ed HECK 2019-11-20 12:15:20 +00:00
FermiandFermi 68a30e9969 Final pass 2019-11-20 12:11:44 +00:00
FermiandFermi 257b60ece6 ID 2019-11-20 11:58:58 +00:00
FermiandFermi 4dd8223634 Undoes circuitboards and converts to sleeper. 2019-11-20 11:58:06 +00:00
FermiandFermi f055d214f2 ID and emag 2019-11-20 11:47:25 +00:00
FermiandFermi 48e1c64c8d Final 2019-11-20 11:35:40 +00:00
Putnam f7361c2059 Made sure every dynamic-controlled event doesn't randomly trigger on dynamic. 2019-11-19 21:58:55 -08:00
Ghommie 10373c7c96 Unmodularize closets. 2019-11-20 06:41:59 +01:00
kevinz000andGitHub 34a8dc5962 Merge pull request #9850 from Ghommie/Ghommie-cit368
fixing a few minor issues with console frames building.
2019-11-19 21:38:58 -07:00
kevinz000andGitHub 7503366524 Merge pull request #9853 from Ghommie/Ghommie-cit370
Adds a few extra cardboard cutout variants.
2019-11-19 21:38:32 -07:00
kevinz000andGitHub 779fac99b4 Merge pull request #9829 from Ghommie/Ghommie-cit361
Unborking id consoles.
2019-11-19 21:33:14 -07:00
kevinz000andGitHub 755559bb66 Merge pull request #9836 from Ghommie/Ghommie-cit364
Ports "Uses defines for turf atmos"
2019-11-19 21:32:42 -07:00
kevinz000andGitHub c7765a032b Merge pull request #9844 from Putnam3145/dynamic-midround-wizard-tweak
Dynamic summon events tweaks
2019-11-19 21:31:14 -07:00
kevinz000andGitHub 56413c1460 Merge pull request #9846 from KathrinBailey/IKEA-station-13
IKEA Station 13: Import TG's Pews
2019-11-19 21:30:56 -07:00
kevinz000andGitHub 4d1a9a0773 Merge pull request #9816 from Ghommie/Ghommie-cit356
Ports "Fixes MMIs not being able to use mecha equipment"
2019-11-19 21:30:13 -07:00
kevinz000andGitHub f883f55391 Merge pull request #9818 from GrayRachnid/portssaboteur
Ports the Saboteur borg for nukeops and new cyborg tools/weapon icons.
2019-11-19 21:28:25 -07:00
Putnam 36d860a4ba Makes from-ghosts ruleset cancel if fewer than required candidates 2019-11-19 20:10:06 -08:00
Ghommie 7c0c14e059 Fixing aux-base construction RCD door access settings menu and reverting another non-functional bit 2019-11-20 03:35:06 +01:00