shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,449 Commits 5 Branches 0 Tags
4768b23398ec63a8f218d38de9a477c03bc0d521
Commit Graph

28332 Commits

Author SHA1 Message Date
silicons
4768b23398 Merge pull request #14860 from Arturlang/nanite_updates 
Updates our nanite stuff to TG's, mostly
 2021-06-18 20:01:05 -07:00
silicons
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
Putnam3145
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
Putnam3145
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
Lin
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
keronshb
a192757843 BUG FIX: Changeling Bone Gauntlets work again (#14862) 
* Fixes Bone Gauntlets

* Better fix

* return
 2021-06-18 19:22:48 +02:00
Putnam3145
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
silicons
a8b7c07f00 Update open.dm 2021-06-17 07:07:49 -07:00
silicons
687d0adf23 Merge remote-tracking branch 'citadel/master' into backend_sync 2021-06-16 19:04:07 -07:00
Lin
1e66357706 Merge pull request #14851 from Vynzill/spritinghell 
Extended Armwraps
 2021-06-16 11:30:01 -07:00
Timothy Teakettle
e12380cc40 Update embedded.dm (#14854) 2021-06-16 19:27:19 +02:00
Artur
5619b73e6b Makes it actually, actually work 2021-06-16 02:02:28 +03:00
Artur
ad0c3d477e Makes it work proper, hopefully 2021-06-16 01:48:54 +03:00
Artur
795ab3f835 https://github.com/tgstation/tgstation/pull/49798 2021-06-16 01:32:24 +03:00
Artur
096e7d4d67 https://github.com/tgstation/tgstation/pull/49927 2021-06-16 01:31:53 +03:00
Artur
fbcd1a3026 https://github.com/tgstation/tgstation/pull/55883 
With a minor tweak so humans don't benefit
 2021-06-16 01:26:02 +03:00
Artur
ab82766757 https://github.com/tgstation/tgstation/pull/59169 2021-06-16 01:19:48 +03:00
Artur
f33343c6db https://github.com/tgstation/tgstation/pull/56739 2021-06-16 01:17:13 +03:00
Artur
74c186d871 https://github.com/tgstation/tgstation/pull/56516 2021-06-16 01:16:39 +03:00
Artur
a430dc4d4d https://github.com/tgstation/tgstation/pull/56542 2021-06-16 01:16:08 +03:00
Artur
f3e16b298b https://github.com/tgstation/tgstation/pull/56588 2021-06-16 01:15:21 +03:00
Artur
b0d7482f04 https://github.com/tgstation/tgstation/pull/55902 2021-06-16 01:09:30 +03:00
Artur
e2eb9d52d0 https://github.com/tgstation/tgstation/pull/55164 2021-06-16 01:03:51 +03:00
Artur
18aee24231 https://github.com/tgstation/tgstation/pull/54902 2021-06-16 01:01:41 +03:00
Artur
337998e99a https://github.com/tgstation/tgstation/pull/54793 2021-06-16 00:46:05 +03:00
Artur
724b34f55d https://github.com/tgstation/tgstation/pull/54710 2021-06-16 00:44:32 +03: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
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
Vynzill
df72710cae herewego 2021-06-14 17:19:05 -05:00
bunny232
03b921a121 Update tank.dm 2021-06-14 06:12:04 -04: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
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
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
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
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
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
silicons
f56e95e4e7 Merge pull request #14841 from MrJWhit/revert-14762-patch-2 
Revert "adds cat meteors"
 2021-06-13 15:15:59 -07: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
silicons
431acd9d5c Merge pull request #14820 from qweq12yt/more-cargo-stuff 
[FIX] Some cargo related fixes
 2021-06-13 15:15:20 -07: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
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
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
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
zerothebigboy
e757f9ea2c thetwentythirdofmany 2021-06-12 17:41:09 -04:00
silicons
2c61a48860 Update mark_datum.dm 2021-06-12 05:09:13 -07:00