 Timothy Teakettle
|
12bf3aebda
|
Merge remote-tracking branch 'upstream/master' into cool-ipcs
|
2020-09-16 05:12:20 +01:00 |
|
|
Timothy Teakettle
|
0d8374a328
|
organic rendering
|
2020-09-16 05:09:21 +01:00 |
|
|
Timothy Teakettle
|
125b50d392
|
Merge branch 'master' into cool-ipcs
|
2020-09-16 05:09:02 +01:00 |
|
|
Changelogs
|
8b2af73a79
|
Automatic changelog compile [ci skip]
|
2020-09-16 00:51:09 +00:00 |
|
|
CitadelStationBot
|
604020c4bc
|
Automatic changelog generation for PR #13388 [ci skip]
|
2020-09-15 19:31:21 -05:00 |
|
|
silicons
|
7f145b7948
|
Merge pull request #13388 from DeltaFire15/plush-ling
Adds peculiar plushies, which are made by failing to make plushmium
|
2020-09-15 17:31:18 -07:00 |
|
|
CitadelStationBot
|
e0b01d4860
|
Automatic changelog generation for PR #13387 [ci skip]
|
2020-09-15 19:31:07 -05:00 |
|
|
silicons
|
1eb5db1c21
|
Merge pull request #13387 from MrJWhit/new-brain-damage-line
New Brain Damage Line
|
2020-09-15 17:31:04 -07:00 |
|
|
CitadelStationBot
|
4796be71ab
|
Automatic changelog generation for PR #13362 [ci skip]
|
2020-09-15 19:30:49 -05:00 |
|
|
silicons
|
39d3a4f596
|
Merge pull request #13362 from Putnam3145/fix-fuid-production
Fixes organ fluid production.
|
2020-09-15 17:30:46 -07:00 |
|
|
CitadelStationBot
|
47276120dd
|
Automatic changelog generation for PR #13356 [ci skip]
|
2020-09-15 19:30:28 -05:00 |
|
|
silicons
|
60106253e3
|
Merge pull request #13356 from EmeraldSundisk/omegasci
Adds the RD's office to OmegaStation.
|
2020-09-15 17:30:24 -07:00 |
|
|
CitadelStationBot
|
d0a12da03c
|
Automatic changelog generation for PR #13365 [ci skip]
|
2020-09-15 19:30:09 -05:00 |
|
|
silicons
|
97c27b30f5
|
Merge pull request #13365 from DeltaFire15/tendril-stuff-fixes
Hey wait isn't there numbers between 11 and 15
|
2020-09-15 17:30:06 -07:00 |
|
|
Changelogs
|
827af29d6f
|
Automatic changelog compile [ci skip]
|
2020-09-16 00:14:30 +00:00 |
|
|
CitadelStationBot
|
15b705dd37
|
Automatic changelog generation for PR #13396 [ci skip]
|
2020-09-15 17:32:40 -05:00 |
|
|
silicons
|
da1f8c92ab
|
Merge pull request #13396 from timothyteakettle/travis-fix
fixes travis
|
2020-09-15 15:32:37 -07:00 |
|
|
timothyteakettle
|
2d1f5ccb43
|
check your paths
|
2020-09-15 23:20:57 +01:00 |
|
|
LetterJay
|
faabf247ef
|
Merge pull request #13389 from Citadel-Station-13/donator_halp
Donator Item - Halo
|
2020-09-15 12:35:38 -05:00 |
|
|
Changelogs
|
e6e1655ee2
|
Automatic changelog compile [ci skip]
|
2020-09-15 00:50:43 +00:00 |
|
|
Changelogs
|
d49934db3b
|
Automatic changelog compile [ci skip]
|
2020-09-15 00:14:43 +00:00 |
|
|
Changelogs
|
4d45746bf0
|
Automatic changelog compile [ci skip]
|
2020-09-14 00:51:30 +00:00 |
|
|
Changelogs
|
e40e0e90c3
|
Automatic changelog compile [ci skip]
|
2020-09-14 00:14:58 +00:00 |
|
|
LetterJay
|
680dee6a82
|
Update __donator.dm
|
2020-09-13 16:28:24 -05:00 |
|
|
Jay
|
511b845b75
|
donator
|
2020-09-13 15:32:09 -05:00 |
|
|
DeltaFire
|
bd183e8e28
|
removes an unneeded check
|
2020-09-13 13:27:57 +02:00 |
|
|
DeltaFire
|
8975b93b37
|
no petting and not petting at the same time
|
2020-09-13 03:43:31 +02:00 |
|
|
DeltaFire
|
2d8655d712
|
plushie shapeshifter
|
2020-09-13 03:25:43 +02:00 |
|
|
Changelogs
|
4742c1a54a
|
Automatic changelog compile [ci skip]
|
2020-09-13 00:52:19 +00:00 |
|
|
Changelogs
|
d64a77807d
|
Automatic changelog compile [ci skip]
|
2020-09-13 00:14:58 +00:00 |
|
|
MrJWhit
|
5757ad1420
|
empty commit
|
2020-09-12 12:46:56 -04:00 |
|
|
MrJWhit
|
3df117cd22
|
Update traumas.json
Haha whoops
|
2020-09-12 02:35:08 -04:00 |
|
|
MrJWhit
|
9a89fa498b
|
Update traumas.json
|
2020-09-12 02:32:17 -04:00 |
|
|
Changelogs
|
5c24ba69fb
|
Automatic changelog compile [ci skip]
|
2020-09-12 00:50:07 +00:00 |
|
|
Changelogs
|
f009253b36
|
Automatic changelog compile [ci skip]
|
2020-09-12 00:14:16 +00:00 |
|
|
DeltaFire
|
9e3710bb51
|
kev request
malf disk gone from the /misc chest type
|
2020-09-11 23:19:55 +02:00 |
|
|
CitadelStationBot
|
db25ca03b5
|
Automatic changelog generation for PR #13351 [ci skip]
|
2020-09-11 16:16:36 -05:00 |
|
|
silicons
|
ad128c292e
|
Merge pull request #13351 from Trilbyspaceclone/patch-402
Correrts open loop on race drinks
|
2020-09-11 14:16:33 -07:00 |
|
|
CitadelStationBot
|
19f372f81e
|
Automatic changelog generation for PR #13355 [ci skip]
|
2020-09-11 16:16:25 -05:00 |
|
|
silicons
|
5f2f524065
|
Merge pull request #13355 from lolman360/AnPrimAssistants
fixes glaives
|
2020-09-11 14:16:22 -07:00 |
|
|
CitadelStationBot
|
e8899e927f
|
Automatic changelog generation for PR #13357 [ci skip]
|
2020-09-11 16:15:57 -05:00 |
|
|
silicons
|
18d949e674
|
Merge pull request #13357 from TheObserver-sys/BrassDatumDirectToYou
Brass Material Datum: "Sbetr Jryy!"
|
2020-09-11 14:15:54 -07:00 |
|
|
CitadelStationBot
|
f1dd6867e8
|
Automatic changelog generation for PR #13363 [ci skip]
|
2020-09-11 16:15:40 -05:00 |
|
|
silicons
|
563b21d8fa
|
Merge pull request #13363 from Putnam3145/bloodsucker-ling-life-code
Signalizes ling/bloodsucker life code.
|
2020-09-11 14:15:37 -07:00 |
|
|
CitadelStationBot
|
00e1c586a7
|
Automatic changelog generation for PR #13368 [ci skip]
|
2020-09-11 16:15:03 -05:00 |
|
|
silicons
|
10a753bf4d
|
Merge pull request #13368 from Tupinambis/CoggyDoggy
Cogstation Fixes and Improvements
|
2020-09-11 14:14:59 -07:00 |
|
|
CitadelStationBot
|
f541dea712
|
Automatic changelog generation for PR #13369 [ci skip]
|
2020-09-11 16:14:47 -05:00 |
|
|
silicons
|
30358d9619
|
Merge pull request #13369 from zeroisthebiggay/godthisisawful
the PR I really didn't want to make - poplocks revolvers to 15 people
|
2020-09-11 14:14:43 -07:00 |
|
|
CitadelStationBot
|
595fee20ba
|
Automatic changelog generation for PR #13370 [ci skip]
|
2020-09-11 16:14:36 -05:00 |
|
|
silicons
|
1453911ca0
|
Merge pull request #13370 from DeltaFire15/gamer-AI-moment
[s] Lets not have certain irreplacable things get qdel()d by one simple trick
|
2020-09-11 14:14:32 -07:00 |
|