 Timothy TeakettleandGitHub
|
974b80a2fd
|
Merge branch 'master' into wound-port
|
2020-07-18 21:45:24 +01:00 |
|
|
Timothy Teakettle
|
fe79c53f04
|
bugfixes
|
2020-07-18 21:40:19 +01:00 |
|
|
siliconsandGitHub
|
56f56d5cbe
|
Update gateway.dm
|
2020-07-18 10:24:36 -07:00 |
|
|
LinandGitHub
|
e165524763
|
Merge pull request #12803 from Citadel-Station-13/silicons-patch-32
removes tango dancing
|
2020-07-18 11:17:42 -05:00 |
|
|
CitadelStationBot
|
08e2d4225a
|
Automatic changelog generation for PR #12812 [ci skip]
|
2020-07-18 09:38:08 -05:00 |
|
|
siliconsandGitHub
|
a991628e00
|
Merge pull request #12812 from Putnam3145/fix-pen
Makes pen uplink work again
|
2020-07-18 07:38:05 -07:00 |
|
|
Putnam
|
d88ade40bf
|
actually fixes uplink
|
2020-07-18 01:51:59 -07:00 |
|
|
kappa-samaandGitHub
|
0364fe8579
|
lower cost
|
2020-07-18 03:50:17 -04:00 |
|
|
kappa-samaandGitHub
|
c39a517519
|
nerf this
|
2020-07-18 03:47:31 -04:00 |
|
|
BlackMajor
|
4635f8aefb
|
fixes not being able to pick up chem/bio bags
|
2020-07-18 19:34:11 +12:00 |
|
|
lolman360andGitHub
|
55ed77a89d
|
Update robot_modules.dm
|
2020-07-18 16:15:47 +10:00 |
|
|
lolman360andGitHub
|
f696a461af
|
Update RSF.dm
|
2020-07-18 16:10:25 +10:00 |
|
|
lolman360andGitHub
|
f84b044f34
|
Update robot_modules.dm
|
2020-07-18 16:05:57 +10:00 |
|
|
lolman360andGitHub
|
0e38e1ff39
|
e
|
2020-07-18 16:03:32 +10:00 |
|
|
BlackMajor
|
68475fe301
|
Forgot to let borgs use the iv drip
|
2020-07-18 17:39:41 +12:00 |
|
|
BlackMajor
|
f68962e9d3
|
This is a bad idea
|
2020-07-18 16:46:08 +12:00 |
|
|
EmeraldSundiskandGitHub
|
61c0ded9ff
|
Merge pull request #52 from Citadel-Station-13/master
7/17
|
2020-07-17 21:38:46 -07:00 |
|
|
BlackMajorandGitHub
|
5a29bc4edc
|
Merge pull request #36 from Citadel-Station-13/master
sync
|
2020-07-18 16:34:01 +12:00 |
|
|
timothyteakettle
|
74b2764591
|
sprites and some missed things
|
2020-07-18 03:08:03 +01:00 |
|
|
timothyteakettle
|
6943462acc
|
changes
|
2020-07-18 02:41:30 +01:00 |
|
|
timothyteakettle
|
e8fade4f7f
|
changes
|
2020-07-18 02:29:12 +01:00 |
|
|
CameronWoof
|
36d25b178a
|
arcade tickets got lost in the resolution
|
2020-07-17 17:35:15 -07:00 |
|
|
Changelogs
|
02f7b1dd1b
|
Automatic changelog compile [ci skip]
|
2020-07-18 00:32:18 +00:00 |
|
|
timothyteakettle
|
8bb9b11922
|
Merge branch 'wound-port' of https://github.com/timothyteakettle/Citadel-Station-13 into wound-port
|
2020-07-18 01:26:41 +01:00 |
|
|
timothyteakettle
|
7714fcfaba
|
more changes
|
2020-07-18 01:26:38 +01:00 |
|
|
CameronWoof
|
431c52b7e2
|
Merge remote-tracking branch 'upstream/master' into advanced-sutures-and-mesh
|
2020-07-17 17:22:43 -07:00 |
|
|
CitadelStationBot
|
94c6ec9963
|
Automatic changelog generation for PR #12761 [ci skip]
|
2020-07-17 19:11:25 -05:00 |
|
|
siliconsandGitHub
|
f8ad4d3186
|
Merge pull request #12761 from EmeraldSundisk/deltadive
A pool and lighting fixes for Delta Station.
|
2020-07-17 17:11:22 -07:00 |
|
|
CitadelStationBot
|
7a518f84d2
|
Automatic changelog generation for PR #12762 [ci skip]
|
2020-07-17 19:11:05 -05:00 |
|
|
siliconsandGitHub
|
b98102a824
|
Merge pull request #12762 from zeroisthebiggay/a
drops martial art minpops down to twenty pop
|
2020-07-17 17:11:02 -07:00 |
|
|
CitadelStationBot
|
de39f32904
|
Automatic changelog generation for PR #12763 [ci skip]
|
2020-07-17 19:10:43 -05:00 |
|
|
siliconsandGitHub
|
a8e2b84ad8
|
Merge pull request #12763 from zeroisthebiggay/b
hopefully fixes records possibly
|
2020-07-17 17:10:40 -07:00 |
|
|
CitadelStationBot
|
32e6d99bb5
|
Automatic changelog generation for PR #12733 [ci skip]
|
2020-07-17 19:10:35 -05:00 |
|
|
siliconsandGitHub
|
c924290cd1
|
Merge pull request #12733 from TheObserver-sys/Finally,moreblorble
Slime Extractification
|
2020-07-17 17:10:32 -07:00 |
|
|
CitadelStationBot
|
88940b30db
|
Automatic changelog generation for PR #12750 [ci skip]
|
2020-07-17 19:10:18 -05:00 |
|
|
siliconsandGitHub
|
044525519a
|
Merge pull request #12750 from timothyteakettle/loadout-plushies
replaces plushies in the loadout menu with a choice box
|
2020-07-17 17:10:14 -07:00 |
|
|
siliconsandGitHub
|
8caf063765
|
Merge pull request #12757 from Owai-Seek/better-snack-comments
Updates some comments.
|
2020-07-17 17:09:50 -07:00 |
|
|
CitadelStationBot
|
f2ea90d71b
|
Automatic changelog generation for PR #12758 [ci skip]
|
2020-07-17 19:09:29 -05:00 |
|
|
siliconsandGitHub
|
b22848b3f7
|
Merge pull request #12758 from MrJWhit/pubby-extra-light
Adds another light to pubby next to the kitchen
|
2020-07-17 17:09:25 -07:00 |
|
|
CitadelStationBot
|
dd4ffa8fee
|
Automatic changelog generation for PR #12759 [ci skip]
|
2020-07-17 19:09:20 -05:00 |
|
|
siliconsandGitHub
|
93d669d205
|
Merge pull request #12759 from YakumoChen/hierophant-hugbox
set hierophant friendly fire check to on by default
|
2020-07-17 17:09:17 -07:00 |
|
|
siliconsandGitHub
|
f135dde538
|
Merge pull request #12785 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/lodash-4.17.19
Bump lodash from 4.17.15 to 4.17.19 in /tgui
|
2020-07-17 17:08:36 -07:00 |
|
|
siliconsandGitHub
|
655afda020
|
Merge pull request #12780 from BlackMajor/borgo
Even more engiborg power creep
|
2020-07-17 17:08:23 -07:00 |
|
|
CitadelStationBot
|
deccc1dfaf
|
Automatic changelog generation for PR #12779 [ci skip]
|
2020-07-17 19:08:09 -05:00 |
|
|
siliconsandGitHub
|
3d5c77f62b
|
Merge pull request #12779 from b1tt3r1n0/circlegame
Circle Game, Updated
|
2020-07-17 17:08:06 -07:00 |
|
|
CitadelStationBot
|
295cfaf093
|
Automatic changelog generation for PR #12776 [ci skip]
|
2020-07-17 19:07:50 -05:00 |
|
|
siliconsandGitHub
|
04df84d1e0
|
Merge pull request #12776 from timothyteakettle/snail-shells
snail shell backpack
|
2020-07-17 17:07:46 -07:00 |
|
|
CitadelStationBot
|
fc5c5932f0
|
Automatic changelog generation for PR #12775 [ci skip]
|
2020-07-17 19:07:09 -05:00 |
|
|
siliconsandGitHub
|
183a929e42
|
Merge pull request #12775 from timothyteakettle/wrestling-rotation-fix
wrestling rotation fix
|
2020-07-17 17:07:06 -07:00 |
|
|
Winter Flare
|
61f4fbc67a
|
Merge branch 'master' into foodport-p2-7/12/20
|
2020-07-17 19:27:50 -04:00 |
|