Fermi
|
d9047e458c
|
Testing and bugfixes
|
2021-01-04 15:47:35 +00:00 |
|
Fermi
|
57cd698994
|
Tweaks and fixes. Should be freature complete now.
|
2021-01-04 13:40:26 +00:00 |
|
Fermi
|
c7965d3b4a
|
Pushing to review diff
|
2021-01-04 10:53:21 +00:00 |
|
Fermi
|
37c3bbbd9c
|
Fixing things and gui
|
2021-01-04 01:48:35 +00:00 |
|
DeltaFire
|
a2bb761bee
|
Merge pull request #13924 from SandPoot/master
Allows mass sticking money into your id
|
2021-01-01 08:15:53 +01:00 |
|
DeltaFire
|
ee6601276d
|
Merge pull request #13935 from Citadel-Station-13/silicons-patch-58
fixes a bug
|
2021-01-01 08:11:40 +01:00 |
|
DeltaFire
|
38565e0027
|
Merge pull request #13909 from silicons/twitch_plays
Twitch Plays: Clown Car
|
2021-01-01 04:14:26 +01:00 |
|
silicons
|
1a027c2fa2
|
good catch
|
2020-12-31 13:34:47 -07:00 |
|
SandPoot
|
a0e95b7c3d
|
Update code/modules/mining/ores_coins.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
|
2020-12-31 16:59:33 -03:00 |
|
DeltaFire
|
c699113061
|
Merge pull request #13928 from Citadel-Station-13/silicons-patch-57
while we're at it let's make holoparasites not carry radiation either thanks @lbd
|
2020-12-31 19:01:12 +01:00 |
|
silicons
|
9c0762f35a
|
Update say_vr.dm
|
2020-12-31 03:41:55 -07:00 |
|
silicons
|
bfa66b2810
|
Merge pull request #13926 from MrJWhit/revert-kevins-shame
Revert kevinzs' shame
|
2020-12-30 14:48:49 -07:00 |
|
DeltaFire
|
62a238e556
|
Merge pull request #13927 from Citadel-Station-13/silicons-patch-56
FUCK OFF WHY IS VORE SHITCODE CAUSING CHERNOBYL AGAIN I HATE VORE CODE
|
2020-12-30 22:46:36 +01:00 |
|
silicons
|
1b9a399bbd
|
Merge pull request #13905 from zeroisthebiggay/help
gives codex cicatrix inhands
|
2020-12-30 14:46:26 -07:00 |
|
silicons
|
3ad65d9b76
|
Merge pull request #13911 from raspy-on-osu/salicyclic-acid
salicyclic acid
|
2020-12-30 14:46:04 -07:00 |
|
silicons
|
e91b3b7a81
|
Merge pull request #13916 from timothyteakettle/better-holoforms
reverts the removal of the holoform verb because kevin likes it
|
2020-12-30 14:45:23 -07:00 |
|
silicons
|
667651aebb
|
Merge pull request #13915 from Xantholne/Birdsitfix
Fixes new bird sprites defaulting to basic parrot when sitting
|
2020-12-30 14:44:28 -07:00 |
|
silicons
|
a9d831d10d
|
Update guardian.dm
|
2020-12-30 14:36:39 -07:00 |
|
silicons
|
909b25892f
|
Update belly_obj.dm
|
2020-12-30 14:22:32 -07:00 |
|
silicons
|
23e77db584
|
Update belly_obj.dm
|
2020-12-30 14:19:37 -07:00 |
|
MrJWhit
|
258c6f3818
|
Update arousal.dm
|
2020-12-30 16:14:03 -05:00 |
|
DeltaFire
|
f957636a82
|
Merge pull request #13917 from timothyteakettle/squeak
*squeak
|
2020-12-30 18:32:30 +01:00 |
|
DeltaFire
|
eebb2e945a
|
Merge pull request #13902 from timothyteakettle/slime-legs
slimes can now have digitigrade/avian legs
|
2020-12-30 18:25:48 +01:00 |
|
DeltaFire
|
3dbf4830f0
|
Merge pull request #13892 from Citadel-Station-13/silicons-patch-50
rebalances changeling combat mutations
|
2020-12-30 18:17:30 +01:00 |
|
SandPoot
|
1fa828a3f7
|
upload files
|
2020-12-30 13:57:10 -03:00 |
|
Lin
|
b062104c2f
|
Merge pull request #13903 from DeltaFire15/ling-deathgasps
Lings no longer deathgasp twice when entering regen stasis
|
2020-12-30 04:09:17 +00:00 |
|
Xantholne
|
19c954fb39
|
asdafsafas
|
2020-12-29 21:04:08 -07:00 |
|
Lin
|
f303151b5f
|
Merge pull request #13910 from Citadel-Station-13/silicons-patch-55
override movespeed for wheelchairs
|
2020-12-30 03:59:40 +00:00 |
|
Xantholne
|
0db821f4f5
|
Fixes missing electus red from trying to be basic parrot and adds
|
2020-12-29 19:33:09 -07:00 |
|
Timothy Teakettle
|
e9d5b622a1
|
squeak
|
2020-12-30 02:25:53 +00:00 |
|
Timothy Teakettle
|
5bc7c5a448
|
revert
|
2020-12-30 02:21:30 +00:00 |
|
silicons
|
2e071b1e0b
|
Merge pull request #13908 from Citadel-Station-13/tgs-dmapi-update
Automatic TGS DMAPI Update
|
2020-12-29 01:28:12 -07:00 |
|
silicons
|
a0fb594236
|
Merge pull request #13900 from Xantholne/Birds
Ports cute birbs from RP
|
2020-12-29 00:50:58 -07:00 |
|
raspy-on-osu
|
d2c0e1ba41
|
salicyclic acid
|
2020-12-29 02:35:42 -05:00 |
|
silicons
|
e76e9ad34c
|
poi
|
2020-12-28 18:02:16 -08:00 |
|
silicons
|
2a58afa77e
|
Update wheelchair.dm
|
2020-12-28 18:57:51 -07:00 |
|
silicons
|
ee9cc135f1
|
fix
|
2020-12-28 17:43:50 -08:00 |
|
silicons
|
abb37896a9
|
please work
|
2020-12-28 17:35:47 -08:00 |
|
silicons
|
6e86cc7758
|
wew
|
2020-12-28 17:27:16 -08:00 |
|
tgstation-server
|
14cefb2d35
|
Update TGS DMAPI
|
2020-12-29 00:59:40 +00:00 |
|
silicons
|
cc0556267e
|
Merge pull request #13904 from DeltaFire15/summonitem-stuff
Adds some more instant summons safety
|
2020-12-28 13:53:46 -07:00 |
|
zerothebigboy
|
6f38ec403f
|
help
|
2020-12-28 15:34:35 -05:00 |
|
silicons
|
1af00db4c1
|
Merge pull request #13869 from timothyteakettle/powergame-puddle
removes slime layering and stops puddle tackling
|
2020-12-28 13:15:30 -07:00 |
|
DeltaFire
|
687c6a9e6f
|
and another one
|
2020-12-28 19:49:42 +01:00 |
|
DeltaFire
|
0bba554052
|
e
|
2020-12-28 19:45:03 +01:00 |
|
DeltaFire
|
01f1844781
|
there
|
2020-12-28 19:15:59 +01:00 |
|
Timothy Teakettle
|
bdb05f5e85
|
Merge remote-tracking branch 'upstream/master' into slime-legs
|
2020-12-28 17:22:53 +00:00 |
|
DeltaFire
|
b1be0159e2
|
Merge pull request #13877 from Citadel-Station-13/silicons-patch-43
heretics uses killonce objectives
|
2020-12-28 17:56:58 +01:00 |
|
DeltaFire
|
13cd2c4424
|
Merge pull request #13880 from Citadel-Station-13/silicons-patch-46
antag rep configs are now actually possible to set for jobs with more than one word in the title
|
2020-12-28 17:56:17 +01:00 |
|
DeltaFire
|
3435a99ec7
|
Merge pull request #13882 from silicons/subtler_tables
adds subtler emote that wraps around adjacent tables
|
2020-12-28 17:55:27 +01:00 |
|