Artur
|
724b34f55d
|
https://github.com/tgstation/tgstation/pull/54710
|
2021-06-16 00:44:32 +03:00 |
|
silicons
|
f119081798
|
let's make this work
|
2021-06-15 12:03:34 -07: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 |
|
silicons
|
66dde6f9ea
|
woo
|
2021-06-14 14:00:02 -07:00 |
|
silicons
|
01e0fa16fe
|
it works.
|
2021-06-14 13:52:48 -07:00 |
|
bunny232
|
03b921a121
|
Update tank.dm
|
2021-06-14 06:12:04 -04:00 |
|
silicons
|
b04a580e1d
|
it works
|
2021-06-13 22:19:06 -07:00 |
|
silicons
|
6495bbcc81
|
Merge remote-tracking branch 'citadel/master' into backend_sync
|
2021-06-13 16:13:30 -07:00 |
|
silicons
|
8595e05ad9
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-06-13 15:37:35 -07:00 |
|
silicons
|
8224546cfc
|
ok
|
2021-06-13 15:36:20 -07:00 |
|
silicons
|
e7f5f80fb1
|
yelling
|
2021-06-13 15:34:47 -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 |
|
silicons
|
e84f7ae4ac
|
fix
|
2021-06-13 01:16:44 -07:00 |
|
silicons
|
5c44cc22f4
|
attempt examinate
|
2021-06-13 00:54:15 -07:00 |
|
silicons
|
b6bb20842f
|
Yelling works
|
2021-06-13 00:50:00 -07: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 |
|
silicons
|
8feb473e65
|
fixes
|
2021-06-12 04:49:23 -07:00 |
|
silicons
|
55e8d67521
|
refactor a bit
|
2021-06-12 04:41:58 -07:00 |
|
silicons
|
85b1125c83
|
fix
|
2021-06-12 04:36:02 -07:00 |
|
zerothebigboy
|
3fae79f876
|
thetwentyfirstofmany
|
2021-06-11 20:28:25 -04:00 |
|
zerothebigboy
|
b7eecc315f
|
theeighteenthofmany
|
2021-06-11 19:49:43 -04:00 |
|
zerothebigboy
|
53e95b7356
|
theseventeenthofmany
|
2021-06-11 19:48:04 -04:00 |
|
zerothebigboy
|
4486b08bd4
|
thefifteenthofmany
|
2021-06-11 19:33:51 -04: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 |
|
Timothy Teakettle
|
e78929cde1
|
typo
|
2021-06-11 17:55:38 +01:00 |
|
Timothy Teakettle
|
baad78e7fe
|
bee
|
2021-06-11 16:08:55 +01:00 |
|
silicons
|
816b09bf32
|
Merge remote-tracking branch 'citadel/master' into backend_sync
|
2021-06-10 22:36:26 -07:00 |
|
qweq12yt
|
584dce4a80
|
updating comments
|
2021-06-11 01:34:19 -03: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 |
|