Fermi
|
614a462176
|
Revert "Revert "Merge remote-tracking branch 'upstream/master'""
This reverts commit 1509d9d183.
|
2019-11-24 03:33:02 +00:00 |
|
Fermi
|
ba4fa1ef67
|
Revert "PLASE"
This reverts commit 8af225e6e3.
|
2019-11-24 03:06:08 +00:00 |
|
Fermi
|
aeb8606ce0
|
Revert "Revert "PLASE""
This reverts commit 00601a0c87.
|
2019-11-24 03:04:52 +00:00 |
|
Fermi
|
2501b5c88c
|
Revert "Revert "Okay""
This reverts commit fb2c29caff.
|
2019-11-24 03:04:27 +00:00 |
|
Fermi
|
3155e3ffb3
|
Revert "Revert "Removes the random love""
This reverts commit ce7e9ac452.
|
2019-11-24 03:04:20 +00:00 |
|
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
|
cb4bfa65d1
|
Revert "?"
This reverts commit 05d18171e0.
|
2019-11-24 03:01:55 +00:00 |
|
Fermi
|
1f7e9d8ab5
|
Revert "please"
This reverts commit ac53c26d87.
|
2019-11-24 03:01:51 +00:00 |
|
Fermi
|
ac53c26d87
|
please
|
2019-11-24 02:58:15 +00:00 |
|
Fermi
|
05d18171e0
|
?
|
2019-11-24 02:57:46 +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 |
|
Fermi
|
135608551f
|
Merge remote-tracking branch 'upstream/master'
|
2019-11-24 02:45:28 +00:00 |
|
Fermi
|
ce7e9ac452
|
Revert "Removes the random love"
This reverts commit b056d91ea5.
|
2019-11-24 02:45:06 +00:00 |
|
Fermi
|
fb2c29caff
|
Revert "Okay"
This reverts commit 37ac0ccb66.
|
2019-11-24 02:44:32 +00:00 |
|
Fermi
|
00601a0c87
|
Revert "PLASE"
This reverts commit 8af225e6e3.
|
2019-11-24 02:44:00 +00:00 |
|
Fermi
|
8af225e6e3
|
PLASE
|
2019-11-24 02:41:21 +00:00 |
|
kevinz000
|
f0996208a3
|
Merge pull request #9874 from Ghommie/Ghommie-cit379
Honkbot slip and slide fun ride.
|
2019-11-23 11:49:32 -07: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
|
f28a6feb5f
|
Merge pull request #9881 from Putnam3145/persistent-dynamic-weights
Allows extended voting on dynamic if recent rounds too chaotic
|
2019-11-23 11:45:58 -07:00 |
|
kevinz000
|
be679b97a6
|
Merge pull request #9885 from Commandersand/cuckcult
Makes the brass skewer more ouchie than ouchie~
|
2019-11-23 11:45:24 -07:00 |
|
kevinz000
|
f88ed98ee4
|
Merge pull request #9909 from kiwedespars/anthromorphic-insect-revert
Anthromorphic Insect Revert
|
2019-11-23 11:44:52 -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 |
|
kevinz000
|
88762c5d89
|
Merge pull request #9864 from Knouli/Legioncore-Use-In-Hand
Able to use Legion Cores in-hand
|
2019-11-23 11:39:35 -07:00 |
|
Lin
|
e954cec58c
|
Merge pull request #9898 from Ghommie/Ghommie-cit387
Dreamchecker compatibility changes, part 3.
|
2019-11-23 05:52:44 +00: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 |
|
Fermi
|
37ac0ccb66
|
Okay
|
2019-11-23 00:23:43 +00:00 |
|
Fermi
|
b404e18b15
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-11-23 00:10:33 +00: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 |
|
Fermi
|
b056d91ea5
|
Removes the random love
|
2019-11-22 23:48:21 +00:00 |
|
Putnam3145
|
b7f7342e43
|
Merge pull request #9900 from Ghommie/Ghommie-cit388
fixing a get_idcard runtime. or The betrayal of the ?. operator
|
2019-11-22 15:41:52 -08:00 |
|
kiwedespars
|
98998ca85f
|
un-moths the anthromorphic insects
|
2019-11-21 19:47:48 -08:00 |
|
Lin
|
522a664f55
|
Merge pull request #9887 from Ghommie/Ghommie-cit385
Martial arts pacifism fixes and boxing buff, more ported pacifist fixes.
|
2019-11-22 02:39:29 +00: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 |
|