Commit Graph
43433 Commits
Author SHA1 Message Date
CitadelStationBot 0e7760fb09 Automatic changelog generation for PR #14831 [ci skip] 2021-06-18 21:58:29 -05:00
siliconsandGitHub bc4773b728 Merge pull request #14831 from zeroisthebiggay/beltsprites
TG Resprite Compendium Atomization Project | Episode Six: Beltslot Sprites & Telebaton Resprite
2021-06-18 19:58:27 -07:00
CitadelStationBot ec2548949b Automatic changelog generation for PR #14864 [ci skip] 2021-06-18 21:58:09 -05:00
siliconsandGitHub 30d5a72688 Merge pull request #14864 from EmeraldSundisk/moresnax
Smaller but more important changes to Snaxi.
2021-06-18 19:58:06 -07:00
CitadelStationBot 5d3384d649 Automatic changelog generation for PR #14847 [ci skip] 2021-06-18 20:52:39 -05:00
Putnam3145andGitHub f6b3bce2f3 Merge pull request #14847 from bunny232/21/79-the-revengence
21/79 not 20/80 the revenge
2021-06-18 18:52:37 -07:00
Putnam3145andGitHub 84068b467a Merge pull request #14658 from silicons/backend_sync
Updates tgui and build backend, fixes the build.bat for those with latest eslint (?)
2021-06-18 17:23:35 -07:00
Changelogs 1400c8deb9 Automatic changelog compile [ci skip] 2021-06-19 00:23:19 +00:00
LinandGitHub adc6b7d76a Merge pull request #14865 from Citadel-Station-13/silicons-patch-39
when sprint is disabled, people jogging can still slip :)
2021-06-18 13:53:23 -07:00
CitadelStationBot eab6579cce Automatic changelog generation for PR #14862 [ci skip] 2021-06-18 12:22:50 -05:00
keronshbandGitHub a192757843 BUG FIX: Changeling Bone Gauntlets work again (#14862)
* Fixes Bone Gauntlets

* Better fix

* return
2021-06-18 19:22:48 +02:00
Putnam3145andGitHub 5d574acdc2 Merge pull request #14794 from Citadel-Station-13/silicons-patch-35
updates GLOB.flags to the new byond limit of 24 flags in one variable, up from 16.
2021-06-18 00:47:07 -07:00
Changelogs 2b89214d14 Automatic changelog compile [ci skip] 2021-06-18 00:22:21 +00:00
siliconsandGitHub a8b7c07f00 Update open.dm 2021-06-17 07:07:49 -07:00
EmeraldSundisk d823c5b168 Update Snaxi.dmm 2021-06-16 21:58:32 -07:00
EmeraldSundiskandGitHub 507b1f43c0 Merge pull request #82 from EmeraldSundisk/Citadel-Station-13-master
Citadel station 13 master
2021-06-16 21:17:32 -07:00
EmeraldSundiskandGitHub 21845e0618 Merge pull request #81 from Citadel-Station-13/master
6/16
2021-06-16 21:16:14 -07:00
silicons 687d0adf23 Merge remote-tracking branch 'citadel/master' into backend_sync 2021-06-16 19:04:07 -07:00
Changelogs 64f762f59b Automatic changelog compile [ci skip] 2021-06-17 00:22:08 +00:00
CitadelStationBot 0a3aa1e94d Automatic changelog generation for PR #14851 [ci skip] 2021-06-16 13:30:04 -05:00
LinandGitHub 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 TeakettleandGitHub 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
LinandGitHub 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
LinandGitHub 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
LinandGitHub 4ae09baa63 Merge pull request #14834 from silicons/on_found
Fixes on_found triggering on storage
2021-06-14 20:15:42 -07:00
LinandGitHub 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
siliconsandGitHub 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
bunny232 03b921a121 Update tank.dm 2021-06-14 06:12:04 -04:00
EmeraldSundiskandGitHub 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
silicons b734c28370 fixes 2021-06-13 16:27:38 -07:00
silicons 6495bbcc81 Merge remote-tracking branch 'citadel/master' into backend_sync 2021-06-13 16:13:30 -07:00
zerothebigboy a64d94a7cc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into beltsprites 2021-06-13 18:25:35 -04:00
CitadelStationBot eb353c9687 Automatic changelog generation for PR #14832 [ci skip] 2021-06-13 17:24:33 -05:00
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub a91d5111c4 Merge pull request #14837 from zeroisthebiggay/trojancoyoteskirt
(held against my will) adds a onesleeved croptop
2021-06-13 15:19:37 -07:00
siliconsandGitHub 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
zerothebigboy bae89fcaba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into beltsprites 2021-06-13 18:19:01 -04:00
CitadelStationBot 3170d60919 Automatic changelog generation for PR #14824 [ci skip] 2021-06-13 17:18:48 -05:00
siliconsandGitHub 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