BlackMajor
|
f68962e9d3
|
This is a bad idea
|
2020-07-18 16:46:08 +12:00 |
|
silicons
|
655afda020
|
Merge pull request #12780 from BlackMajor/borgo
Even more engiborg power creep
|
2020-07-17 17:08:23 -07:00 |
|
silicons
|
e03948dcba
|
Merge pull request #12229 from Arturlang/TGUI-3.0
[READY]TGUI 3.0
|
2020-07-16 17:28:42 -07:00 |
|
Timothy Teakettle
|
ebd648c03d
|
name edgecase too
|
2020-07-16 18:32:24 +01:00 |
|
Timothy Teakettle
|
a8a495c0ac
|
rewrites pickle handling
|
2020-07-16 18:22:58 +01:00 |
|
BlackMajor
|
fc909cd7c6
|
Added material sheets and tiles. This took more work than you'd think.
|
2020-07-17 01:17:54 +12:00 |
|
Arturlang
|
92ed5d3201
|
Merge branch 'master' into TGUI-3.0
|
2020-07-16 15:59:37 +03:00 |
|
Artur
|
af65b626e3
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-16 15:56:08 +03:00 |
|
Letter N
|
2afab07b4a
|
https://github.com/tgstation/tgstation/pull/52255
|
2020-07-16 20:05:37 +08:00 |
|
timothyteakettle
|
8bfc30c8ac
|
i can't spell
|
2020-07-16 02:54:31 +01:00 |
|
timothyteakettle
|
03bd806c73
|
pickle
|
2020-07-16 02:51:07 +01:00 |
|
Timothy Teakettle
|
a7e2668eff
|
funniest
|
2020-07-15 23:50:39 +01:00 |
|
silicons
|
6121cbd091
|
Merge pull request #12738 from timothyteakettle/travelling-traders
the travelling trader midround event
|
2020-07-15 08:50:20 -07:00 |
|
BlackMajor
|
bd7c9d11d3
|
oh no
|
2020-07-16 02:02:29 +12:00 |
|
silicons
|
c333a71c74
|
Update life.dm
|
2020-07-14 04:30:38 -07:00 |
|
Artur
|
5f9364c5f8
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-13 16:20:54 +03:00 |
|
Timothy Teakettle
|
29628dd82a
|
cows
|
2020-07-12 21:40:16 +01:00 |
|
Timothy Teakettle
|
c1592ad162
|
more rewards
|
2020-07-11 23:27:29 +01:00 |
|
Lin
|
a75dd1d8f3
|
Merge pull request #12729 from Citadel-Station-13/silicons-patch-20
whooshing now happens at pressure difference * 2.5% probability instead of people hearing space wind from someone exhaling next to them
|
2020-07-11 15:47:03 -05:00 |
|
silicons
|
926f64e13d
|
Merge pull request #12722 from kappa-sama/patch-31
lowers wisdom cow's spawnrate to standard and makes it 66% less spammy
|
2020-07-11 00:49:29 -07:00 |
|
silicons
|
08a6ef88e3
|
Merge pull request #12711 from LetterN/nerfs-cats
[s] Updates goonchat [ready]
|
2020-07-11 00:46:32 -07:00 |
|
silicons
|
dc1de02b74
|
Update human_movement.dm
|
2020-07-09 23:44:17 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|