Commit Graph

43327 Commits

Author SHA1 Message Date
silicons a91d5111c4 Merge pull request #14837 from zeroisthebiggay/trojancoyoteskirt
(held against my will) adds a onesleeved croptop
2021-06-13 15:19:37 -07:00
silicons a88561d1aa Merge pull request #14770 from keronshb/spaceadaptaura
Changes Space Adapt to a proper animated outline so it doesn't look awful.
2021-06-13 15:19:08 -07:00
CitadelStationBot 3170d60919 Automatic changelog generation for PR #14824 [ci skip] 2021-06-13 17:18:48 -05:00
silicons d6aaf5c96a Merge pull request #14824 from timothyteakettle/bee
bees can go in containers and are released upon opening the container
2021-06-13 15:18:46 -07:00
CitadelStationBot a8f7a56d41 Automatic changelog generation for PR #14814 [ci skip] 2021-06-13 17:17:21 -05:00
silicons dc80bcaabb Merge pull request #14814 from TripleShades/delda
Delta Tweaks
2021-06-13 15:17:18 -07:00
CitadelStationBot ef5a523729 Automatic changelog generation for PR #14816 [ci skip] 2021-06-13 17:16:39 -05:00
silicons d0fc422b3a Merge pull request #14816 from SandPoot/tablet-pen-slot
Adds a pen slot for tablet computers
2021-06-13 15:16:37 -07:00
CitadelStationBot 81cd001359 Automatic changelog generation for PR #14841 [ci skip] 2021-06-13 17:16:02 -05:00
silicons f56e95e4e7 Merge pull request #14841 from MrJWhit/revert-14762-patch-2
Revert "adds cat meteors"
2021-06-13 15:15:59 -07:00
CitadelStationBot fe031f32c0 Automatic changelog generation for PR #14813 [ci skip] 2021-06-13 17:15:35 -05:00
silicons 2dd0d014b9 Merge pull request #14813 from SandPoot/small-issues
Fixes some small issues with cosmetic syndicate clothing (loadout clothing)
2021-06-13 15:15:32 -07:00
CitadelStationBot 0f2bbc2a13 Automatic changelog generation for PR #14820 [ci skip] 2021-06-13 17:15:22 -05:00
silicons 431acd9d5c Merge pull request #14820 from qweq12yt/more-cargo-stuff
[FIX] Some cargo related fixes
2021-06-13 15:15:20 -07:00
CitadelStationBot b2f530da5d Automatic changelog generation for PR #14836 [ci skip] 2021-06-13 17:15:07 -05:00
silicons 5e1818819b Merge pull request #14836 from timothyteakettle/funny-tips
adds 7 more round tips
2021-06-13 15:15:04 -07:00
CitadelStationBot 6efe680a47 Automatic changelog generation for PR #14830 [ci skip] 2021-06-13 17:14:32 -05:00
silicons b77da2824a Merge pull request #14830 from zeroisthebiggay/dishdrive
TG Resprite Compendium Atomization Project | Episode Five: Dish Drives
2021-06-13 15:14:30 -07:00
CitadelStationBot f02098d1a1 Automatic changelog generation for PR #14829 [ci skip] 2021-06-13 17:14:07 -05:00
silicons 211fed05d7 Merge pull request #14829 from zeroisthebiggay/singulohammer
TG Resprite Compendium Atomization Project | Episode Four: Singularity Hammers
2021-06-13 15:14:04 -07:00
CitadelStationBot 81be45f062 Automatic changelog generation for PR #14826 [ci skip] 2021-06-13 17:13:49 -05:00
silicons 33d8e95144 Merge pull request #14826 from zeroisthebiggay/bankmachine
TG Resprite Compendium Atomization Project | Episode Two: Bank Machines
2021-06-13 15:13:46 -07:00
CitadelStationBot 5324544a63 Automatic changelog generation for PR #14825 [ci skip] 2021-06-13 17:13:25 -05:00
silicons 8eff0ca5b3 Merge pull request #14825 from zeroisthebiggay/watercooler
TG Resprite Compendium Atomization Project | Episode One: Water Coolers
2021-06-13 15:13:23 -07:00
MrJWhit a324701730 Revert "adds cat meteors" 2021-06-13 05:25:02 -04:00
zerothebigboy a395fc1b52 a 2021-06-12 19:58:53 -04:00
Timothy Teakettle 1303f4b9ae Update tips.txt 2021-06-12 15:34:58 +01:00
TripleShades 01a61b551c Update DeltaStation2.dmm 2021-06-12 01:08:22 -04:00
Changelogs 405135834e Automatic changelog compile [ci skip] 2021-06-12 00:20:05 +00:00
zerothebigboy 4486b08bd4 thefifteenthofmany 2021-06-11 19:33:51 -04:00
Putnam3145 979aa04a69 Merge pull request #14828 from silicons/sigh_516
fixes the crafting menu, adds an unit test to automatically yell at people who PR untested code that ended up breaking it for me (thanks drpanis)
2021-06-11 16:22:06 -07:00
zerothebigboy 8a5a5ef6cc thethirteenthofmany 2021-06-11 19:22:05 -04:00
silicons b188a6ea0f why 2021-06-11 16:15:31 -07:00
zerothebigboy 39d951a4a8 thesixthofmany 2021-06-11 18:24:29 -04:00
zerothebigboy 5bf831be0f thefourthofmany 2021-06-11 18:17:16 -04:00
Timothy Teakettle e78929cde1 typo 2021-06-11 17:55:38 +01:00
Timothy Teakettle baad78e7fe bee 2021-06-11 16:08:55 +01:00
qweq12yt 584dce4a80 updating comments 2021-06-11 01:34:19 -03:00
qweq12yt 78470092fc Update settings.json 2021-06-11 01:12:16 -03:00
CitadelStationBot c33348fe18 Automatic changelog generation for PR #14768 [ci skip] 2021-06-10 19:52:15 -05:00
BlackMajor 86881dc1af Merge pull request #14768 from Citadel-Station-13/silicons-patch-33
makes xenos immune to stamina damage, with something that might be potentially horrifically abusable but isn't really fixable in a clean way yet
2021-06-11 12:52:12 +12:00
Changelogs a683754160 Automatic changelog compile [ci skip] 2021-06-11 00:23:59 +00:00
qweq12yt 0ca61af62a fixed combo lockers 2021-06-10 16:50:44 -03:00
SandPoot 3321e17c6f Update NtosWindow.js
Delet unused stuff
2021-06-09 21:48:06 -03:00
SandPoot e63eac2c57 upload NtosWindow.js 2021-06-09 21:47:33 -03:00
SandPoot 79c501a7b4 upload files 2021-06-09 21:36:43 -03:00
Changelogs 9376ec0d04 Automatic changelog compile [ci skip] 2021-06-10 00:25:00 +00:00
TripleShades 42b8120f74 Update DeltaStation2.dmm 2021-06-09 15:47:33 -04:00
TripleShades 0ca6e983c9 changies
delda changies good
2021-06-09 15:32:48 -04:00
CitadelStationBot d3f1a163b1 Automatic changelog generation for PR #14683 [ci skip] 2021-06-09 14:14:39 -05:00