 SandPoot
|
a1905591f7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-08-24 23:49:10 -03:00 |
|
|
SandPoot
|
c07e94be66
|
push
|
2024-08-24 21:28:55 -03:00 |
|
|
SandPoot
|
fc53ab850c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-14 20:15:08 -03:00 |
|
|
Elizabeth Lavenza
|
7f2e5a8945
|
Fix nonexistent keyboard overlays
|
2024-04-13 20:14:19 -04:00 |
|
|
SandPoot
|
b76127c2d7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-03-15 19:21:39 -03:00 |
|
|
SandPoot
|
676cb864b1
|
missed proc refs
|
2024-03-12 22:17:30 -03:00 |
|
|
SandPoot
|
40f1d7401d
|
procs
|
2023-11-29 22:40:13 -03:00 |
|
|
SandPoot
|
05349c27e9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-04-15 23:43:43 -03:00 |
|
|
SandPoot
|
586a035132
|
Update files
|
2022-04-06 18:41:31 -03:00 |
|
|
SandPoot
|
07fe9bdbca
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-03-14 15:09:35 -03:00 |
|
|
siliconsandGitHub
|
a3284a0923
|
Merge pull request #15195 from DeltaFire15/med-revivalchem-nerf
Weakens chemistry's revival chems
|
2022-03-13 14:24:57 -07:00 |
|
|
SandPoot
|
2c4fcaba81
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-10-06 15:04:36 -03:00 |
|
|
DeltaFire
|
97eb42b35b
|
defib policy hook & oxyheal
|
2021-10-04 15:49:12 +02:00 |
|
|
DeltaFire
|
7752e0d624
|
synthtissue and sr
|
2021-09-22 22:30:43 +02:00 |
|
|
SandPoot
|
dfe4a91219
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-08-11 13:06:19 -03:00 |
|
|
siliconsandGitHub
|
51dbc8e21f
|
Merge pull request #14685 from Arturlang/fake_blood
Reworks blood regeneration into something a bit more tame
|
2021-08-11 02:54:49 -07:00 |
|
|
SandPoot
|
ab9b824ce9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-08-08 14:18:09 -03:00 |
|
|
Artur
|
5acd7fef2d
|
makes salglu not deadly
|
2021-08-02 21:54:47 +03:00 |
|
|
Artur
|
3100f98b90
|
https://github.com/tgstation/tgstation/pull/57915
|
2021-07-28 02:13:57 +03:00 |
|
|
Artur
|
cdbd585f4d
|
update_appearance
|
2021-07-28 02:13:57 +03:00 |
|
|
Artur
|
d185c5a3e9
|
Re-adds the badmin nanite hub
|
2021-07-28 02:13:24 +03:00 |
|
|
Artur
|
2adfbea215
|
Merge remote-tracking branch 'origin/master' into fake_blood
|
2021-07-23 18:50:09 +03:00 |
|
|
SandPoot
|
8b45f2affd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-06-22 22:10:50 -03:00 |
|
|
DeltaFire
|
c7a098da06
|
suffering (aka, a bunch of fixes)
|
2021-06-21 19:05:31 +02:00 |
|
|
SandPoot
|
c48360be5c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-06-19 10:20:49 -03: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
|
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 |
|
|
SandPoot
|
002be6d415
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-05-31 12:39:32 -03:00 |
|
|
siliconsandGitHub
|
cb52be5dd9
|
fixes linter warnings (#14778)
* woo
* woo
|
2021-05-31 10:19:20 -05:00 |
|
|
Artur
|
35bfba1f6a
|
Redoes the variable changes into procs
|
2021-05-05 18:15:13 +03:00 |
|
|
Artur
|
92e6646a4c
|
time to make blood even more pain
|
2021-05-05 14:44:21 +03:00 |
|
|
SandPoot
|
23ac8a1963
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-12-14 11:30:47 -03:00 |
|
|
silicons
|
8f36a1d2ec
|
okay
|
2020-11-22 15:20:52 -07:00 |
|
|
silicons
|
13ebceb670
|
why did i do this
|
2020-11-22 14:56:02 -07:00 |
|
|
silicons
|
c7e60191df
|
whew
|
2020-11-22 14:44:05 -07:00 |
|
|
silicons
|
5ae410790b
|
locking
|
2020-11-22 14:40:57 -07:00 |
|
|
silicons
|
37e26833a6
|
wew
|
2020-11-22 14:16:14 -07:00 |
|
|
SandPoot
|
936ab121ed
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-10-18 22:53:23 -03:00 |
|