Commit Graph

15185 Commits

Author SHA1 Message Date
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
silicons
9abeb9c07e Merge pull request #12631 from Citadel-Station-13/Ghommie-patch-1
Nerfing shaft miners' paycheck.
2020-07-02 01:43:53 -07:00
Artur
582d672109 Hardsuit strip menu helmet toggle 2020-07-02 01:31:15 +03:00
Timothy Teakettle
15e137dd18 Merge branch 'master' into tray-and-jar 2020-07-01 22:06:17 +01:00
Timothy Teakettle
84d60a455e wow its still spelt wrong 2020-07-01 21:53:34 +01:00
Timothy Teakettle
1cb1b4d7e6 oh my god its not even defined right 2020-07-01 21:29:10 +01:00
Timothy Teakettle
311e149562 fix bloodpacks 2020-07-01 21:00:01 +01:00
Ghommie
94f7dae62e Porting "Fix asset cache verification" and other tiny bits. 2020-07-01 16:24:12 +02:00
kappa-sama
cfc14a04f1 Merge branch 'master' into patch-28 2020-07-01 07:48:46 -04:00
kappa-sama
1f38c3029c yeah ok 2020-07-01 07:40:43 -04:00
Letter N
b35e3f2b93 fix: R&D Console, Vending, and chem master 2020-07-01 19:07:03 +08:00
YakumoChen
8e25b90d54 removes obselete part 2020-07-01 09:08:01 +00:00
YakumoChen
327a36f8bd removes obselete autolathe designs 2020-07-01 09:06:29 +00:00
YakumoChen
67b5efbce0 Update pistol.dm 2020-07-01 09:03:48 +00:00
kappa-sama
e03112d1dc these 2020-07-01 04:59:59 -04:00
YakumoChen
346007b4fb Update beams.dm 2020-07-01 08:58:27 +00:00
YakumoChen
a3961a642c removes improv laser 2020-07-01 08:57:48 +00:00
YakumoChen
baf41d828a removes improv laser 2020-07-01 08:57:35 +00:00
YakumoChen
550aa405e5 Update pistol.dm 2020-07-01 08:56:43 +00:00
YakumoChen
d9e5847b8f Update pistol.dm 2020-07-01 08:56:13 +00:00
YakumoChen
6a48b9199f Update ammo_boxes.dm 2020-07-01 08:55:42 +00:00
YakumoChen
6ec2cba2be Update laser.dm 2020-07-01 08:54:42 +00:00
YakumoChen
36592431a9 Update pistol.dm 2020-07-01 08:53:54 +00:00
timothyteakettle
0f0e0298e5 newline at end of file 2020-07-01 03:34:17 +01:00
timothyteakettle
d1f92da74a 20 is fine if we edit volume 2020-07-01 03:29:22 +01:00
timothyteakettle
4865831b6e alright this is a bad meme 2020-07-01 03:28:37 +01: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
silicons
d22ab62b50 Update combat.dm 2020-06-29 23:20:52 -07:00
timothyteakettle
10a0e1b688 stick it on the right node 2020-06-30 00:46:27 +01: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
Ghom
3c4a288ecc Merge pull request #12625 from Citadel-Station-13/silicons-patch-9
maybe fixes edge cases where half the server has their client input system broken
2020-06-30 00:21:42 +02:00
silicons
771714cc78 Merge pull request #12629 from kappa-sama/patch-28
https://github.com/tgstation/tgstation/pull/51886 by Fikou
2020-06-29 14:50:59 -07: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
silicons
26fee48cec Merge pull request #12645 from Ghommie/Ghommie-cit825
More and more fixes.
2020-06-29 14:18:10 -07:00
Putnam3145
ee2fedd4af Merge pull request #12390 from Ghommie/Ghommie-cit800
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
2020-06-29 12:44:33 -07:00
Putnam3145
42809d8b0c Merge pull request #12416 from Ghommie/Ghommie-cit792
TGUI-next Check Skills menu.
2020-06-29 12:44:08 -07:00
Ghommie
fa25858fd7 Fix. :) 2020-06-29 21:31:24 +02:00
Ghom
b280c0f550 Merge pull request #12622 from timothyteakettle/grammar-fixes
big batch of spelling/grammar corrections
2020-06-29 21:13:06 +02:00
Ghom
8cc7b4fea0 Merge pull request #12643 from YakumoChen/master
Minor fix
2020-06-29 19:25:34 +02:00
Ghommie
0779dd560e More and more fixes. 2020-06-29 18:52:37 +02:00
YakumoChen
3b802ac062 actually stocks the new clothing 2020-06-29 13:38:36 +00:00
silicons
6265cb190b Update bindings_client.dm 2020-06-29 05:04:28 -07:00