 FermiandFermi
|
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 |
|
|
FermiandFermi
|
c8b206a4cf
|
Revert "pls"
This reverts commit 8c97511871.
|
2019-11-24 03:04:04 +00:00 |
|
|
FermiandFermi
|
4c1c257035
|
Revert "Revert "pls""
This reverts commit b23f2a4460.
|
2019-11-24 03:02:21 +00:00 |
|
|
FermiandFermi
|
9eaed4ea8e
|
Revert "pls2"
This reverts commit 0eb635b908.
|
2019-11-24 03:02:04 +00:00 |
|
|
FermiandFermi
|
8ea6618f5d
|
Revert "ARGH"
This reverts commit f0f52ce3f8.
|
2019-11-24 03:01:59 +00:00 |
|
|
FermiandFermi
|
cb4bfa65d1
|
Revert "?"
This reverts commit 05d18171e0.
|
2019-11-24 03:01:55 +00:00 |
|
|
FermiandFermi
|
1f7e9d8ab5
|
Revert "please"
This reverts commit ac53c26d87.
|
2019-11-24 03:01:51 +00:00 |
|
|
FermiandFermi
|
ac53c26d87
|
please
|
2019-11-24 02:58:15 +00:00 |
|
|
FermiandFermi
|
05d18171e0
|
?
|
2019-11-24 02:57:46 +00:00 |
|
|
FermiandFermi
|
f0f52ce3f8
|
ARGH
|
2019-11-24 02:55:50 +00:00 |
|
|
FermiandFermi
|
0eb635b908
|
pls2
ugh
|
2019-11-24 02:52:17 +00:00 |
|
|
FermiandFermi
|
b23f2a4460
|
Revert "pls"
This reverts commit 8c97511871.
|
2019-11-24 02:49:20 +00:00 |
|
|
FermiandFermi
|
8c97511871
|
pls
ugh
|
2019-11-24 02:47:52 +00:00 |
|
|
FermiandFermi
|
135608551f
|
Merge remote-tracking branch 'upstream/master'
|
2019-11-24 02:45:28 +00:00 |
|
|
FermiandFermi
|
ce7e9ac452
|
Revert "Removes the random love"
This reverts commit b056d91ea5.
|
2019-11-24 02:45:06 +00:00 |
|
|
FermiandFermi
|
fb2c29caff
|
Revert "Okay"
This reverts commit 37ac0ccb66.
|
2019-11-24 02:44:32 +00:00 |
|
|
FermiandFermi
|
00601a0c87
|
Revert "PLASE"
This reverts commit 8af225e6e3.
|
2019-11-24 02:44:00 +00:00 |
|
|
FermiandFermi
|
8af225e6e3
|
PLASE
|
2019-11-24 02:41:21 +00:00 |
|
|
kevinz000andGitHub
|
f0996208a3
|
Merge pull request #9874 from Ghommie/Ghommie-cit379
Honkbot slip and slide fun ride.
|
2019-11-23 11:49:32 -07:00 |
|
|
kevinz000andGitHub
|
be679b97a6
|
Merge pull request #9885 from Commandersand/cuckcult
Makes the brass skewer more ouchie than ouchie~
|
2019-11-23 11:45:24 -07:00 |
|
|
kevinz000andGitHub
|
f88ed98ee4
|
Merge pull request #9909 from kiwedespars/anthromorphic-insect-revert
Anthromorphic Insect Revert
|
2019-11-23 11:44:52 -07:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
LinandGitHub
|
e954cec58c
|
Merge pull request #9898 from Ghommie/Ghommie-cit387
Dreamchecker compatibility changes, part 3.
|
2019-11-23 05:52:44 +00:00 |
|
|
YakumoChenandGitHub
|
1c8b557466
|
fixes AI.dm again
|
2019-11-23 04:13:30 +00:00 |
|
|
YakumoChenandGitHub
|
6426e5dade
|
makes the icons not break
|
2019-11-23 03:54:39 +00:00 |
|
|
YakumoChenandGitHub
|
a6ff44782a
|
adds more unique ai holograms
|
2019-11-23 03:51:04 +00:00 |
|
|
FermiandFermi
|
37ac0ccb66
|
Okay
|
2019-11-23 00:23:43 +00:00 |
|
|
FermiandFermi
|
b404e18b15
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-11-23 00:10:33 +00:00 |
|
|
GrayRachnid
|
77913406ed
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
|
2019-11-22 18:50:24 -05:00 |
|
|
Putnam3145andGitHub
|
6145cd0d96
|
Merge pull request #9886 from Ghommie/Ghommie-cit384
chem dispenser beakers and bikehorn fixes.
|
2019-11-22 15:48:28 -08:00 |
|
|
FermiandFermi
|
b056d91ea5
|
Removes the random love
|
2019-11-22 23:48:21 +00:00 |
|
|
Putnam3145andGitHub
|
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 |
|
|
GrayRachnid
|
a7918717ff
|
fixes compile errors.
|
2019-11-22 18:22:53 -05:00 |
|
|
GrayRachnid
|
c8e52fb8e1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
|
2019-11-22 15:24:15 -05:00 |
|
|
Ghommie
|
7d3599b2f9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit277
|
2019-11-22 18:53:58 +01:00 |
|
|
Ghommie
|
66a97cb224
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310
|
2019-11-22 05:17:42 +01:00 |
|
|
kiwedesparsandGitHub
|
98998ca85f
|
un-moths the anthromorphic insects
|
2019-11-21 19:47:48 -08:00 |
|
|
LinandGitHub
|
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 |
|
|
LinandGitHub
|
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 |
|
|
LinandGitHub
|
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 |
|
|
Unknown
|
4974400ccb
|
Merge branch 'master' into xantholne-berets01
|
2019-11-21 11:01:42 -07:00 |
|
|
Useroth
|
29ae9eb962
|
Added reagent IDs.
|
2019-11-21 12:52:49 +01:00 |
|
|
Useroth
|
2ced7db508
|
Ported a bunch of tg hydroponic stuff.
|
2019-11-21 10:53:57 +01:00 |
|
|
Ghommie
|
bfeece4c6e
|
fixing a get_idcard runtime. The betrayal of the ?.
|
2019-11-21 09:23:05 +01:00 |
|
|
|
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
|
6a0bd7c925
|
THE REVENGE OF THE WHITESPACES
|
2019-11-21 07:40:49 +01: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 |
|
|
Unknown
|
71b3b8fdc6
|
Ports/Adds new Berets
Ports some berets adds even more to most jobs
|
2019-11-20 22:21:20 -07:00 |
|