 timothyteakettle
|
8eda04bc60
|
Merge branch 'tray-and-jar' of https://github.com/timothyteakettle/Citadel-Station-13 into tray-and-jar
|
2020-07-07 03:03:32 +01:00 |
|
|
timothyteakettle
|
ab5795b3d3
|
Update pet_carrier.dm
|
2020-07-07 03:03:09 +01:00 |
|
|
Timothy Teakettle
|
2fa1b3e095
|
Merge branch 'tray-and-jar' of https://github.com/timothyteakettle/Citadel-Station-13 into tray-and-jar
|
2020-07-04 18:44:51 +01:00 |
|
|
Timothy Teakettle
|
5c5746c04c
|
less air
|
2020-07-04 18:44:47 +01:00 |
|
|
timothyteakettle
|
d3448e04c9
|
fixes pet carrier edgecase
|
2020-07-04 03:00:35 +01:00 |
|
|
timothyteakettle
|
05fb7a67fc
|
Merge branch 'tray-and-jar' of https://github.com/timothyteakettle/Citadel-Station-13 into tray-and-jar
|
2020-07-03 03:46:12 +01:00 |
|
|
timothyteakettle
|
1316f51a03
|
better resist and air
|
2020-07-03 03:46:08 +01:00 |
|
|
Timothy TeakettleandGitHub
|
15e137dd18
|
Merge branch 'master' into tray-and-jar
|
2020-07-01 22:06:17 +01:00 |
|
|
Timothy TeakettleandGitHub
|
8a0ab009dd
|
give trays better capacity
|
2020-07-01 22:05:14 +01:00 |
|
|
CitadelStationBot
|
6fdf713491
|
Automatic changelog generation for PR #12656 [ci skip]
|
2020-07-01 14:30:20 -05:00 |
|
|
LinandGitHub
|
fa1e92d588
|
Merge pull request #12656 from Ghommie/Ghommie-cit826
Fixing two handed items and etcetera.
|
2020-07-01 14:30:16 -05:00 |
|
|
GhomandGitHub
|
8666f83848
|
Merge pull request #12620 from EmeraldSundisk/omegasec2
Gives Omega Station genpop.
|
2020-07-01 19:52:44 +02:00 |
|
|
GhomandGitHub
|
aaffe3ec12
|
Merge pull request #12647 from zeroisthebiggay/fuckfuckfuckfuck
attempts to port Wizard Gamemode now ends when all wizards and wizard apprentices are dead #47514
|
2020-07-01 19:46:16 +02:00 |
|
|
GhomandGitHub
|
d8d9038b24
|
Merge pull request #12659 from silicons/ok
removes sexchem jumpsuit ripping
|
2020-07-01 19:39:04 +02:00 |
|
|
CitadelStationBot
|
6b3254ef39
|
Automatic changelog generation for PR #12654 [ci skip]
|
2020-07-01 08:17:52 -05:00 |
|
|
GhomandGitHub
|
f5debba324
|
Merge pull request #12654 from Citadel-Station-13/silicons-patch-13
readds bohbombing
|
2020-07-01 15:17:47 +02:00 |
|
|
GhomandGitHub
|
8de00e80dd
|
Update bag_of_holding.dm
|
2020-07-01 15:04:51 +02:00 |
|
|
|
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 |
|
|
silicons
|
434a53340b
|
groan
|
2020-06-30 20:21:59 -07:00 |
|
|
Ghommie
|
cd1c5511a4
|
Fixing two handed items and etcetera.
|
2020-06-30 16:24:04 +02:00 |
|
|
siliconsandGitHub
|
837a77585c
|
Update bag_of_holding.dm
|
2020-06-30 00:41:09 -07:00 |
|
|
timothyteakettle
|
27a83ebb05
|
sprite pls
|
2020-06-30 01:14:48 +01:00 |
|
|
Changelogs
|
28fd6304e2
|
Automatic changelog compile [ci skip]
|
2020-06-30 00:08:43 +00:00 |
|
|
timothyteakettle
|
685da5b0e6
|
improve jar sprite
|
2020-06-30 01:06:12 +01:00 |
|
|
CitadelStationBot
|
005e548288
|
Automatic changelog generation for PR #12288 [ci skip]
|
2020-06-29 19:05:08 -05:00 |
|
|
Putnam3145andGitHub
|
062768c273
|
Merge pull request #12288 from Ghommie/Ghommie-cit765
Porting the twohanded component.
|
2020-06-29 17:05:04 -07:00 |
|
|
timothyteakettle
|
6852506469
|
improve tray sprite
|
2020-06-30 01:04:50 +01: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 |
|
|
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 |
|
|
GhomandGitHub
|
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 |
|
|
Timothy Teakettle
|
3eb5901a57
|
air is good
|
2020-06-29 22:56:25 +01:00 |
|
|
CitadelStationBot
|
491b225631
|
Automatic changelog generation for PR #12629 [ci skip]
|
2020-06-29 16:51:02 -05:00 |
|
|
siliconsandGitHub
|
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 |
|
|
CitadelStationBot
|
9f35c8475f
|
Automatic changelog generation for PR #12598 [ci skip]
|
2020-06-29 16:47:28 -05:00 |
|
|
siliconsandGitHub
|
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 |
|
|
siliconsandGitHub
|
bfbe472114
|
Merge pull request #12587 from Ragolution/peachesnz
Peachening 2 Even with Master Boogaloo
|
2020-06-29 14:22:32 -07:00 |
|
|
CitadelStationBot
|
2d6035c84f
|
Automatic changelog generation for PR #12645 [ci skip]
|
2020-06-29 16:18:15 -05:00 |
|
|
siliconsandGitHub
|
26fee48cec
|
Merge pull request #12645 from Ghommie/Ghommie-cit825
More and more fixes.
|
2020-06-29 14:18:10 -07:00 |
|
|
CitadelStationBot
|
fdd8fec4ef
|
Automatic changelog generation for PR #12390 [ci skip]
|
2020-06-29 14:44:36 -05:00 |
|
|
Putnam3145andGitHub
|
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 |
|
|
CitadelStationBot
|
62b4c54064
|
Automatic changelog generation for PR #12416 [ci skip]
|
2020-06-29 14:44:11 -05:00 |
|
|
Putnam3145andGitHub
|
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 |
|
|
CitadelStationBot
|
9930244aae
|
Automatic changelog generation for PR #12622 [ci skip]
|
2020-06-29 14:13:09 -05:00 |
|