Fermi
|
1509d9d183
|
Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit 135608551f, reversing
changes made to ce7e9ac452.
|
2019-11-24 03:04:13 +00:00 |
|
Fermi
|
c8b206a4cf
|
Revert "pls"
This reverts commit 8c97511871.
|
2019-11-24 03:04:04 +00:00 |
|
Fermi
|
4c1c257035
|
Revert "Revert "pls""
This reverts commit b23f2a4460.
|
2019-11-24 03:02:21 +00:00 |
|
Fermi
|
9eaed4ea8e
|
Revert "pls2"
This reverts commit 0eb635b908.
|
2019-11-24 03:02:04 +00:00 |
|
Fermi
|
8ea6618f5d
|
Revert "ARGH"
This reverts commit f0f52ce3f8.
|
2019-11-24 03:01:59 +00:00 |
|
Fermi
|
f0f52ce3f8
|
ARGH
|
2019-11-24 02:55:50 +00:00 |
|
Fermi
|
0eb635b908
|
pls2
ugh
|
2019-11-24 02:52:17 +00:00 |
|
Fermi
|
b23f2a4460
|
Revert "pls"
This reverts commit 8c97511871.
|
2019-11-24 02:49:20 +00:00 |
|
Fermi
|
8c97511871
|
pls
ugh
|
2019-11-24 02:47:52 +00:00 |
|
kevinz000
|
aba39f0b36
|
Merge pull request #9891 from Putnam3145/dynamic-traitor-fix
[DYNAMIC] Reverted making latejoiners count for roundstart rulesets
|
2019-11-23 11:46:28 -07:00 |
|
kevinz000
|
75510d8da9
|
Merge pull request #9749 from Trilbyspaceclone/patch-238
What do you mean I cant hold the armory on my back? -BOH nerf
|
2019-11-23 11:42:37 -07:00 |
|
Lin
|
592dcdb6fd
|
Merge pull request #9896 from Ghommie/Ghommie-cit386
Fixing cyborg camera interaction for real
|
2019-11-23 05:52:11 +00:00 |
|
Lin
|
028fa518e4
|
Merge pull request #9879 from Ghommie/Ghommie-cit383
Unmodularize closets.
|
2019-11-23 05:39:33 +00:00 |
|
Putnam3145
|
037b278e9e
|
Merge pull request #9918 from Ghommie/Ghommie-cit384
[S] Makes it compile.
|
2019-11-22 18:14:41 -08:00 |
|
Ghommie
|
77800cf720
|
Oh yea it's a list
|
2019-11-23 03:02:29 +01:00 |
|
Ghommie
|
2d1edf661b
|
Fixes travis.
|
2019-11-23 02:58:03 +01:00 |
|
Putnam3145
|
ea4fdf727b
|
Merge pull request #9917 from Ghommie/Ghommie-cit384
[S] bikehorn fix 2: sound() doesn't accept double quotes i think, my bad.
|
2019-11-22 17:06:50 -08:00 |
|
Ghommie
|
82d97ff4a7
|
This way is better
|
2019-11-23 01:51:31 +01:00 |
|
Ghommie
|
24c93d9df6
|
[S] bikehorn fix 2: sound() datum doesn't accept double quotes, my bad.
|
2019-11-23 01:46:59 +01:00 |
|
Putnam3145
|
6145cd0d96
|
Merge pull request #9886 from Ghommie/Ghommie-cit384
chem dispenser beakers and bikehorn fixes.
|
2019-11-22 15:48:28 -08:00 |
|
Lin
|
1ddb9935ff
|
Merge pull request #9530 from Ghommie/Ghommie-cit245
Touching up job outfits equip procs, little PDA fix.
|
2019-11-22 02:37:49 +00:00 |
|
Lin
|
3979079fde
|
Merge pull request #9518 from Ghommie/Ghommie-cit243
Ports "You can now click on objects and mobs below flaps and signs"
|
2019-11-22 01:36:47 +00:00 |
|
Lin
|
c2d182d50d
|
Merge pull request #9823 from Seris02/wintergalorefix
Adds HoS, HoP, CE, CMO, QM, RD, chemistry, genetics, virology, robotics, janitor and cosmic winter coats - Try 2
|
2019-11-22 01:16:35 +00:00 |
|
Lin
|
2412bad483
|
Merge pull request #9889 from GrayRachnid/fixgoldbox
Fixes gold toolbox inhand sprite having the wrong name
|
2019-11-22 01:14:39 +00:00 |
|
kevinz000
|
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 |
|
kevinz000
|
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 |
|
kevinz000
|
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 |
|
kevinz000
|
540a57b518
|
Merge pull request #9828 from Putnam3145/dynamic-meteor-nonrepeat
Makes meteor not repeatable in dynamic.
|
2019-11-20 21:53:05 -07:00 |
|
kevinz000
|
8df8acb1b7
|
Merge pull request #9811 from Ghommie/Ghommie-cit353
Dreamchecker compatibility changes, part 2.
|
2019-11-20 21:49:58 -07:00 |
|
kevinz000
|
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 |
|
kevinz000
|
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 |
|
kevinz000
|
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 |
|
GrayRachnid
|
4ae76cf1d9
|
WHY
D
|
2019-11-20 23:11:46 -05: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 |
|
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 |
|
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 |
|
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 |
|
kevinz000
|
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 |
|
kevinz000
|
7503366524
|
Merge pull request #9853 from Ghommie/Ghommie-cit370
Adds a few extra cardboard cutout variants.
|
2019-11-19 21:38:32 -07:00 |
|
kevinz000
|
779fac99b4
|
Merge pull request #9829 from Ghommie/Ghommie-cit361
Unborking id consoles.
|
2019-11-19 21:33:14 -07:00 |
|
kevinz000
|
755559bb66
|
Merge pull request #9836 from Ghommie/Ghommie-cit364
Ports "Uses defines for turf atmos"
|
2019-11-19 21:32:42 -07:00 |
|
kevinz000
|
c7765a032b
|
Merge pull request #9844 from Putnam3145/dynamic-midround-wizard-tweak
Dynamic summon events tweaks
|
2019-11-19 21:31:14 -07:00 |
|
kevinz000
|
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 |
|
kevinz000
|
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 |
|