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 |
|
kevinz000
|
61692f290a
|
Merge pull request #12121 from Ghommie/Ghommie-cit723
Generic skills support for items, level based skill type. Wiring skill.
|
2020-05-08 01:24:44 -07:00 |
|
Lin
|
ae3b2a58f9
|
Merge pull request #12129 from Ghommie/Ghommie-cit726
Fixing some sprite issues and nit-picks.
|
2020-05-08 03:00:20 +00:00 |
|
kevinz000
|
51081fcb1a
|
ok (#12083)
|
2020-05-08 03:36:08 +02:00 |
|
Ghommie
|
60bdbfaf61
|
Merge conflicts, procs instead of macros, mood signals.
|
2020-05-08 02:12:41 +02:00 |
|
Ghommie
|
74e7f7ea46
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit726
|
2020-05-07 22:14:11 +02:00 |
|
kevinz000
|
9c08df761f
|
fixes
|
2020-05-07 11:50:38 -07:00 |
|
kevinz000
|
05068f80db
|
Merge remote-tracking branch 'citadel/master' into combat_rework
|
2020-05-07 10:57:10 -07:00 |
|
kevinz000
|
ebb6eaa69a
|
a
|
2020-05-07 09:30:34 -07:00 |
|
Ghom
|
a273fc0fed
|
Merge branch 'master' into Ghommie-cit721
|
2020-05-07 18:18:54 +02:00 |
|
kevinz000
|
888f0a932f
|
Merge pull request #12124 from Ghommie/Ghommie-cit725
Makes wings/horns colors dna features instead of human variables
|
2020-05-07 09:10:08 -07:00 |
|
kevinz000
|
73144a4f92
|
Merge branch 'master' into typing_indicators
|
2020-05-07 09:04:44 -07:00 |
|
kevinz000
|
f02e8da23a
|
blockdirs
|
2020-05-07 08:54:21 -07:00 |
|
kevinz000
|
532aba9157
|
fixes
|
2020-05-07 08:36:15 -07:00 |
|