 silicons
|
9c9c611285
|
ok
|
2020-07-09 23:34:35 -07:00 |
|
|
silicons
|
31da81aff4
|
Merge pull request #12217 from Putnam3145/putnamos-for-real
The real fastmos: C++ monstermos port
|
2020-07-09 20:37:18 -07:00 |
|
|
kappa-sama
|
a798061f71
|
also this
|
2020-07-09 16:14:38 -05:00 |
|
|
Artur
|
9de8483bcf
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-09 22:14:20 +03:00 |
|
|
Timothy Teakettle
|
02f46322ad
|
port examine
|
2020-07-09 18:32:45 +01:00 |
|
|
silicons
|
26d384e65b
|
fix
|
2020-07-09 03:17:17 -07:00 |
|
|
silicons
|
bf4936cb02
|
Merge pull request #12707 from Chiirno/slimebrain
Resprited brains into a new slime core sprite for jelly people.
|
2020-07-09 02:26:27 -07:00 |
|
|
Putnam
|
a625d6562b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
|
2020-07-08 22:02:03 -07:00 |
|
|
Letter N
|
05684e7196
|
no config filter thing yet, but the code for it is "ready"
|
2020-07-08 16:36:58 +08:00 |
|
|
Letter N
|
f757e54db9
|
muh immursion
|
2020-07-08 15:59:44 +08:00 |
|
|
silicons
|
6cbab55ef8
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-07 21:07:58 -07:00 |
|
|
silicons
|
bd8cc4791f
|
whew
|
2020-07-07 21:02:23 -07:00 |
|
|
silicons
|
6ee63f66aa
|
whew
|
2020-07-07 20:48:54 -07:00 |
|
|
Trilbyspaceclone
|
062d514ac2
|
Update legion.dm
|
2020-07-07 14:30:09 -04:00 |
|
|
Trilbyspaceclone
|
ddeb564c80
|
Legion fix
|
2020-07-07 14:21:16 -04:00 |
|
|
Cirno
|
37f4022bfc
|
Changed slime core to slime nucleus
|
2020-07-07 13:35:30 -03:00 |
|
|
Artur
|
280d3de6c3
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-07 18:37:45 +03:00 |
|
|
Cirno
|
fe45971e43
|
Added a slime core in the place of brains for jelly people
|
2020-07-07 12:05:06 -03:00 |
|
|
silicons
|
6634e43be4
|
fix
|
2020-07-07 07:41:33 -07:00 |
|
|
silicons
|
cee15792b7
|
ok
|
2020-07-07 07:25:10 -07:00 |
|
|
Timothy Teakettle
|
23d00ea671
|
stops double applied damage and stuns
|
2020-07-07 01:44:28 +01:00 |
|
|
Lin
|
d04b335d1a
|
Merge pull request #12652 from silicons/cool
cybernetic implant shields will now automatically extend and be used to block if the user has no item to block with
|
2020-07-04 14:12:43 -05:00 |
|
|
silicons
|
c10350f10e
|
Merge pull request #12677 from Ghommie/Ghommie-cit830
Fixes items' skills list keys missing associated traits and improves modulability a little.
|
2020-07-04 00:12:37 -07:00 |
|
|
silicons
|
dbf88a1408
|
Merge pull request #12676 from Ghommie/Ghommie-cit829
Improvements to the recent clothing menu toggle hardsuit helmet feature.
|
2020-07-04 00:12:29 -07:00 |
|
|
silicons
|
a61e22de71
|
Merge pull request #12675 from Ghommie/Ghommie-cit828
Fixing (un)equip penalties from obscured inv slots.
|
2020-07-04 00:12:04 -07:00 |
|
|
Ghommie
|
e3b1ca4942
|
Linter.
|
2020-07-03 19:57:38 +02:00 |
|
|
Ghommie
|
bde80eb1fb
|
Fixing obscured inventory slots (un)equip block, for real.
|
2020-07-03 19:02:20 +02:00 |
|
|
Artur
|
f0154f3f1c
|
conflicts!!!
|
2020-07-03 15:45:11 +03:00 |
|
|
silicons
|
d85edbf8fb
|
ok
|
2020-07-03 02:15:06 -07:00 |
|
|
silicons
|
a738d52740
|
oh god oh FUCK
|
2020-07-03 00:11:09 -07:00 |
|
|
Ghommie
|
f5ffd7d2a9
|
Easing fine tuning of the system.
|
2020-07-03 03:00:33 +02:00 |
|
|
Ghommie
|
92c846fdbf
|
Improvements to the recent clothing menu toggle hardsuit helmet feature.
|
2020-07-03 01:08:28 +02:00 |
|
|
Ghom
|
50716ee393
|
Merge pull request #12668 from Arturlang/strip_menu_helmet
Hardsuit strip menu helmet toggle
|
2020-07-03 00:41:03 +02:00 |
|
|
Ghommie
|
6fc584518a
|
Fixing (un)equip penalties from obscured inv slots.
|
2020-07-03 00:07:30 +02:00 |
|
|
Artur
|
6ee1eba56c
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-02 23:23:47 +03:00 |
|
|
silicons
|
3f1119fcdb
|
Merge pull request #12630 from Ghommie/Ghommie-cit822
You can't (un)equip garments on/from obscured inventory slots anymore.
|
2020-07-02 01:44:59 -07:00 |
|
|
silicons
|
cbad654371
|
Merge pull request #12632 from Ghommie/Ghommie-cit823
Ups melee stam cost multiplier from 0.8 back to 1, made stam cost for throwing mobs scale with mob_size
|
2020-07-02 01:44:09 -07:00 |
|
|
Artur
|
2931c03ccb
|
Ghommie fixes
strongDMM autofixed wildest, hopefully it didnt break anything
|
2020-07-02 01:48:28 +03:00 |
|
|
Artur
|
582d672109
|
Hardsuit strip menu helmet toggle
|
2020-07-02 01:31:15 +03:00 |
|
|
silicons
|
f03343b516
|
fix
|
2020-06-30 05:19:50 -07:00 |
|
|
silicons
|
2039496739
|
groan
|
2020-06-30 03:05:15 -07:00 |
|
|
silicons
|
9756431612
|
Spelling
|
2020-06-29 23:52:18 -07:00 |
|
|
silicons
|
7a2818d657
|
fix
|
2020-06-29 23:45:18 -07:00 |
|
|
silicons
|
6a91ce8416
|
fix
|
2020-06-29 23:43:53 -07:00 |
|
|
silicons
|
ee34f37ac2
|
fix
|
2020-06-29 23:41:53 -07:00 |
|
|
silicons
|
3b3a3ad44e
|
nayser
|
2020-06-29 23:37:51 -07:00 |
|
|
Artur
|
20245f7319
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-30 02:30:29 +03:00 |
|
|
Ghommie
|
9dc4b99620
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-30 00:49:06 +02:00 |
|
|
silicons
|
52953cae4d
|
Merge pull request #12598 from timothyteakettle/improves-char-customization
speech options on char customization, small skeleton changes
|
2020-06-29 14:47:25 -07:00 |
|
|
Timothy Teakettle
|
a7c905dfe9
|
handles skeletons better
|
2020-06-29 22:37:04 +01:00 |
|