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
|
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
|
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 |
|
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
|
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 |
|
Ghommie
|
bfeece4c6e
|
fixing a get_idcard runtime. The betrayal of the ?.
|
2019-11-21 09:23:05 +01:00 |
|
loginsandylogout
|
a95b78af52
|
Update code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-11-21 00:52:52 -06:00 |
|
Ghommie
|
5153ed04ec
|
aaa
|
2019-11-21 06:48:26 +01:00 |
|
Ghommie
|
911a33bfd6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit387
|
2019-11-21 06:36:59 +01:00 |
|
Ghommie
|
dccb3c2e22
|
part 3
|
2019-11-21 06:36:22 +01: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 |
|
kevinz000
|
30aefd050a
|
Merge pull request #9868 from Ghommie/Ghommie-cit376
Fixes superlube waterflower.
|
2019-11-20 22:08:54 -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 |
|
nik707
|
8d363b8e9d
|
Merge pull request #9323 from Citadel-Station-13/kevinz000-patch-85
adds poll ignore for magical antagonists
|
2019-11-20 23:03:39 -06:00 |
|
nik707
|
0300927974
|
Merge pull request #9487 from Citadel-Station-13/spooky
adds an easy way for admins to force enable halloween races without the rest of halloween's code
|
2019-11-20 23:00:09 -06:00 |
|
nik707
|
56d2c0edad
|
Merge pull request #9681 from Citadel-Station-13/kevinz000-patch-107
buffs bluespace apprentice (targeted teleport --> blink)
|
2019-11-20 22:55:21 -06:00 |
|
nik707
|
28190bc168
|
Merge pull request #9703 from Citadel-Station-13/kevinz000-patch-109
emagged medibots now murder the everloving fuck out of slimepeople
|
2019-11-20 22:52:11 -06:00 |
|
nik707
|
df11e75414
|
Merge pull request #9718 from Citadel-Station-13/kevinz000-patch-110
fixes a bug with rnd multiprinting
|
2019-11-20 22:51:32 -06:00 |
|
nik707
|
6d889e66c4
|
Merge pull request #9720 from Citadel-Station-13/kevinz000-patch-111
Is it the time of year to buff disablers again?
|
2019-11-20 22:51:11 -06: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
|
47888bd208
|
Merge pull request #9877 from Ghommie/Ghommie-cit381
Unmodularize pAI holo-chassis icons.
|
2019-11-20 21:47:00 -07:00 |
|
kevinz000
|
f82dd255dc
|
Merge pull request #9869 from Hatterhat/ayy-dna-manip
what if i gave botanists the ability to get the fancy alien dna manipulator. haha, just kidding. ...unless?
|
2019-11-20 21:46:37 -07:00 |
|
Ghommie
|
920eba0b03
|
ayy
|
2019-11-20 21:41:59 +01:00 |
|
Ghommie
|
aab7ad192b
|
Martial arts pacifism fixes and boxing buff, more ported pacifist fixes.
|
2019-11-20 21:00:17 +01:00 |
|
Ghommie
|
ac44bfcad2
|
chem dispenser beakers and bikehorn fixes.
|
2019-11-20 17:55:11 +01:00 |
|
loginsandylogout
|
5395e0c893
|
meme
|
2019-11-20 10:35:40 -06:00 |
|