 Ghom
|
9d2399ce9f
|
Removing unused files and fixing some stuff. (#12250)
|
2020-05-15 07:15:15 -07:00 |
|
|
Arturlang
|
ada31990d0
|
Fixes prosthetic causing bloodsuckers to bug out (#12136)
* Fixes prosthetic causing bloodsuckers to bug out
* Moved it per ghommies suggestions
|
2020-05-14 13:44:48 +02:00 |
|
|
Lin
|
0d92783a91
|
oops. (#12242)
|
2020-05-14 00:22:57 +02:00 |
|
|
Lin
|
2dedf0d6b6
|
Merge pull request #12015 from kevinz000/typing_indicators
Typing Indicators (v2)
|
2020-05-13 18:19:26 +00:00 |
|
|
Artur
|
dabdf16eac
|
Coonflict fiiixeeess
|
2020-05-13 12:56:17 +03:00 |
|
|
Artur
|
5b7d9a9008
|
Merge conflict fix
|
2020-05-13 12:37:18 +03:00 |
|
|
Putnam
|
86afd889f1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
|
2020-05-12 22:39:32 -07:00 |
|
|
Lin
|
fd30edca9c
|
infinixeno (#12234)
|
2020-05-13 03:18:25 +02:00 |
|
|
Putnam
|
8458f97692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
|
2020-05-12 13:34:31 -07:00 |
|
|
kevinz000
|
81424914e6
|
Merge pull request #12215 from Trilbyspaceclone/patch-377
Adds more ballmer lines
|
2020-05-12 12:35:05 -07:00 |
|
|
kevinz000
|
395d434e6e
|
Merge pull request #12200 from Ghommie/Ghommie-cit738
nutrition adjustment wrapper procs from tg.
|
2020-05-12 12:28:02 -07:00 |
|
|
kevinz000
|
40d2d35ffa
|
Merge pull request #12205 from Ghommie/Ghommie-cit741
A few runtimes, fixed.
|
2020-05-12 12:27:45 -07:00 |
|
|
kevinz000
|
afbbde610a
|
Merge pull request #12201 from Ghommie/Ghommie-cit740
Purging unused dogborg items.
|
2020-05-12 12:27:26 -07:00 |
|
|
kevinz000
|
1f773cf4fe
|
fixes
|
2020-05-12 11:52:45 -07:00 |
|
|
Ghommie
|
7fb96ab0cf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-05-12 20:06:59 +02:00 |
|
|
Putnam
|
f4f80594bd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
|
2020-05-11 17:10:55 -07:00 |
|
|
Putnam
|
e8d7da56f4
|
Ported C++mos from yogs (help me)
|
2020-05-11 15:44:26 -07:00 |
|
|
Trilbyspaceclone
|
95330e4baf
|
Update life.dm
|
2020-05-11 17:17:04 -04:00 |
|
|
Trilbyspaceclone
|
c14197bd1b
|
Update life.dm
|
2020-05-11 17:16:10 -04:00 |
|
|
Trilbyspaceclone
|
0df3483d6f
|
Update life.dm
|
2020-05-11 17:15:29 -04:00 |
|
|
Trilbyspaceclone
|
8fa1a0ba58
|
Update life.dm
|
2020-05-11 15:48:01 -04:00 |
|
|
Trilbyspaceclone
|
720abbf1c5
|
Update life.dm
|
2020-05-11 15:21:49 -04:00 |
|
|
Trilbyspaceclone
|
1e5cce73d9
|
Update life.dm
|
2020-05-11 15:19:39 -04:00 |
|
|
kevinz000
|
dbfa8ac1ea
|
Merge branch 'master' into typing_indicators
|
2020-05-11 05:00:23 -07:00 |
|
|
Lin
|
5a6b48cdfb
|
Merge pull request #12191 from Ghommie/Ghommie-cit736
Fixing IPCs and synth lizard antennas not showing up.
|
2020-05-11 03:40:39 +00:00 |
|
|
kevinz000
|
f292d4047c
|
Adds OOC notes (#12067)
* ooc notes
* fixes
* repath
* ok
* This SHOULD compile, or else...
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-05-11 01:35:48 +02:00 |
|
|
Ghom
|
9b68a036af
|
Update ice_demon.dm
|
2020-05-10 23:53:37 +02:00 |
|
|
kevinz000
|
7cfbdf3a1d
|
Update human.dm (#12203)
|
2020-05-10 23:51:49 +02:00 |
|
|
Ghommie
|
46ba884965
|
A few runtimes, fixed.
|
2020-05-10 23:47:30 +02:00 |
|
|
kevinz000
|
1cf2311930
|
Merge pull request #12164 from Ghommie/Ghommie-cit733
Porting "Refactors language holder"
|
2020-05-10 14:16:42 -07:00 |
|
|
kevinz000
|
6b9fc7eccf
|
Merge pull request #12169 from Ghommie/Ghommie-cit734
Porting some radial menu updates, and that one clown mask skin.
|
2020-05-10 14:14:19 -07:00 |
|
|
Ghommie
|
5ed6a18ef7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit740
|
2020-05-10 22:36:04 +02:00 |
|
|
Ghommie
|
e0b91c53af
|
Purging unused dogborg items.
|
2020-05-10 22:17:05 +02:00 |
|
|
Ghommie
|
667c12d413
|
nutrition adjustment wrapper procs.
|
2020-05-10 21:41:50 +02:00 |
|
|
Lin
|
dd7db603d2
|
Merge pull request #12159 from Ghommie/Ghommie-cit732
'mob_run_block' and 'mob_check_block' macros
|
2020-05-10 18:25:16 +00:00 |
|
|
kevinz000
|
05cede4e4d
|
fixes xenomorphs not being in combat mode (#12193)
* ok
* Update combat.dm
|
2020-05-10 17:38:07 +02:00 |
|
|
Ghommie
|
6666c651d5
|
Fixing IPCs and synth lizard antennas not showing up.
|
2020-05-10 03:06:39 +02:00 |
|
|
kevinz000
|
6993aa20ce
|
ok
|
2020-05-09 09:18:57 -07:00 |
|
|
kevinz000
|
407b1c7447
|
Merge remote-tracking branch 'citadel/master' into projectiles_2
|
2020-05-08 23:32:01 -07:00 |
|
|
kevinz000
|
dcdda5451e
|
Merge pull request #12146 from Trilbyspaceclone/patch-368
slows down ice demons
|
2020-05-08 23:29:50 -07:00 |
|
|
kevinz000
|
a66aad9b70
|
compile
|
2020-05-08 23:03:44 -07:00 |
|
|
kevinz000
|
0f157204eb
|
compile
|
2020-05-08 23:02:41 -07:00 |
|
|
kevinz000
|
19072abe37
|
compile
|
2020-05-08 23:01:05 -07:00 |
|
|
kevinz000
|
e684c6e574
|
ok
|
2020-05-08 22:40:07 -07:00 |
|
|
Seris02
|
381333bf82
|
a (#11873)
|
2020-05-09 02:15:41 +02:00 |
|
|
Ghommie
|
88d86e53d0
|
Porting some radial menu updates, and that one clown mask.
|
2020-05-09 00:45:48 +02:00 |
|
|
Ghommie
|
2858ddd90b
|
Porting "Refactors language holder"
|
2020-05-08 22:44:02 +02:00 |
|
|
Ghommie
|
ffd5dd9615
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit732
|
2020-05-08 19:01:28 +02:00 |
|
|
Ghommie
|
a412e840f7
|
'mob_run_block' and 'mob_check_block' macros
|
2020-05-08 18:52:32 +02:00 |
|
|
Trilbyspaceclone
|
a6bf258f5c
|
Update ice_demon.dm
|
2020-05-08 04:33:40 -04:00 |
|