Commit Graph

43381 Commits

Author SHA1 Message Date
CitadelStationBot
0a3aa1e94d Automatic changelog generation for PR #14851 [ci skip] 2021-06-16 13:30:04 -05:00
Lin
1e66357706 Merge pull request #14851 from Vynzill/spritinghell
Extended Armwraps
2021-06-16 11:30:01 -07:00
CitadelStationBot
dc6b686ac5 Automatic changelog generation for PR #14854 [ci skip] 2021-06-16 12:27:22 -05:00
Timothy Teakettle
e12380cc40 Update embedded.dm (#14854) 2021-06-16 19:27:19 +02:00
Changelogs
3864baaf76 Automatic changelog compile [ci skip] 2021-06-16 00:23:43 +00:00
Lin
70de0547ab Merge pull request #14713 from silicons/json_interface
adds json topic api for manifest, players, revision, and status.
2021-06-14 20:17:05 -07:00
Lin
9277e685e9 Merge pull request #14797 from Citadel-Station-13/silicons-patch-36-1
Delete docker_publish.yml
2021-06-14 20:15:52 -07:00
CitadelStationBot
e22ea7de59 Automatic changelog generation for PR #14834 [ci skip] 2021-06-14 22:15:45 -05:00
Lin
4ae09baa63 Merge pull request #14834 from silicons/on_found
Fixes on_found triggering on storage
2021-06-14 20:15:42 -07:00
Lin
84a6467fc9 Merge pull request #14835 from Citadel-Station-13/silicons-patch-37
Mark datum is now a global verb
2021-06-14 20:14:05 -07:00
Changelogs
a1db7518e2 Automatic changelog compile [ci skip] 2021-06-15 00:23:42 +00:00
Vynzill
df72710cae herewego 2021-06-14 17:19:05 -05:00
CitadelStationBot
c3f87c312c Automatic changelog generation for PR #14849 [ci skip] 2021-06-14 16:30:56 -05:00
silicons
ecd3454ce5 Merge pull request #14849 from EmeraldSundisk/snaxifollowup
Quick Snaxi fixes.
2021-06-14 14:30:53 -07:00
EmeraldSundisk
4fec75fe87 initialfix 2021-06-14 08:48:14 -07:00
EmeraldSundisk
a121153f0f Merge pull request #80 from Citadel-Station-13/master
6/13
2021-06-13 22:33:35 -07:00
Changelogs
38d40b5892 Automatic changelog compile [ci skip] 2021-06-14 00:22:34 +00:00
CitadelStationBot
eb353c9687 Automatic changelog generation for PR #14832 [ci skip] 2021-06-13 17:24:33 -05:00
silicons
49efd115ee Merge pull request #14832 from zeroisthebiggay/miscsprites
TG Resprite Compendium Atomization Project | Episode Seven: Misc. Resprites & Distinctive Combat Defibs
2021-06-13 15:24:30 -07:00
CitadelStationBot
cc88ebd185 Automatic changelog generation for PR #14818 [ci skip] 2021-06-13 17:19:48 -05:00
silicons
ddf885f42e Merge pull request #14818 from EmeraldSundisk/snaxiforrealthistime
HEY HEY! COME ON OVER, HAVE SOME FUN WITH SNOW TAXI!!!
2021-06-13 15:19:46 -07:00
CitadelStationBot
744ed08466 Automatic changelog generation for PR #14837 [ci skip] 2021-06-13 17:19:39 -05:00
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
zerothebigboy
319e03476b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into miscsprites 2021-06-13 18:16:08 -04: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
EmeraldSundisk
c44750760d Add files via upload 2021-06-12 21:34:41 -07:00
EmeraldSundisk
686798b789 stronk 2021-06-12 21:21:43 -07:00