Commit Graph

26370 Commits

Author SHA1 Message Date
kappa-sama 5c7c300bf0 these do nothing 2020-07-01 04:58:44 -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
YakumoChen ed017cc22a Update sheet_types.dm 2020-07-01 08:53:08 +00:00
YakumoChen 4c460278b4 removes improv handgun spawns 2020-07-01 08:52:09 +00:00
YakumoChen 6f50664189 removes improv handguns 2020-07-01 08:48:10 +00:00
YakumoChen 35ee3e6aeb No pocket guns, unstupids part names 2020-07-01 08:43:34 +00:00
silicons 8f30d7f4d1 Update code/datums/components/storage/concrete/bag_of_holding.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-06-30 20:27:30 -07: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
bunny232 afe9b2dfbd Update holy_weapons.dm 2020-06-30 11:15:40 -04:00
Ghommie cd1c5511a4 Fixing two handed items and etcetera. 2020-06-30 16:24:04 +02:00
Artur e6dee77b79 Telecomms fixes 2020-06-30 17:01:54 +03:00
Artur fa6386f1a9 Skills and clockwork build 2020-06-30 16:08:31 +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 837a77585c Update bag_of_holding.dm 2020-06-30 00:41:09 -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 84f6efe683 Update shields.dm 2020-06-29 23:22:48 -07:00
silicons d22ab62b50 Update combat.dm 2020-06-29 23:20:52 -07:00
timothyteakettle 1748088d42 small sprite improvement 2020-06-30 00:56:54 +01:00
timothyteakettle b36ce5ee5f starts locked so it doesnt look ass 2020-06-30 00:47:38 +01:00
timothyteakettle 10a0e1b688 stick it on the right node 2020-06-30 00:46:27 +01:00
timothyteakettle bbd9d3c61f better air 2020-06-30 00:38:33 +01:00
Artur 20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
zerothebigboy 40c515b383 i hope this works 2020-06-29 19:13:26 -04:00
Timothy Teakettle 0e57e0dd7a atmos 2020-06-30 00:09:14 +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
Artur 2797aefc3a Clockworkslab and ui resizing 2020-06-30 01:05:43 +03:00
Timothy Teakettle 3eb5901a57 air is good 2020-06-29 22:56:25 +01:00
Cirno 03d79a1b65 I think this changed pills? 2020-06-29 18:52:21 -03: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