Chiirno
|
84d311e201
|
nightmare now oneshots glowshrooms, miner beacons, and console screens.
|
2021-01-03 02:44:47 -04:00 |
|
Lin
|
b3c1c69861
|
Merge pull request #13944 from Citadel-Station-13/silicons-patch-59
fixes matrix labels on colormates (swapped 1 and 2, rg is actually gr)
|
2021-01-02 16:17:24 +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 |
|
silicons
|
fbb2cfbba1
|
Update colormate.dm
|
2020-12-31 23:05:14 -07: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 |
|
silicons
|
f1205efa0f
|
Merge pull request #13885 from raspy-on-osu/spaceheater-buff
Makes space heaters worth using
|
2020-12-31 12:38:07 -07: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
|
813471dbbb
|
Merge pull request #13914 from EmeraldSundisk/cog2020
Some area designation fixes for CogStation.
|
2020-12-30 14:44:52 -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 |
|
DeltaFire
|
1e3c2f802f
|
Merge pull request #13913 from keronshb/scarpparrytweak
Local Martial Artist forgets one line of code (fixes Scarp Parrying)
|
2020-12-30 17:53:41 +01: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
|
97deaf3482
|
Update twitch_plays.dm
|
2020-12-29 15:56:10 -07:00 |
|
silicons
|
95c420ccba
|
Update twitch_plays.dm
|
2020-12-29 15:55:14 -07:00 |
|
EmeraldSundisk
|
b1f76a8566
|
Update Space_Station_13_areas.dm
|
2020-12-29 11:38:07 -08:00 |
|
EmeraldSundisk
|
0707f6ecfc
|
Update Space_Station_13_areas.dm
|
2020-12-29 10:56:58 -08:00 |
|
EmeraldSundisk
|
6af5d180d0
|
Update Space_Station_13_areas.dm
|
2020-12-29 10:29:28 -08:00 |
|
keronshb
|
99a890b355
|
Adds block_parry_data
Ooops forgot one line of code
|
2020-12-29 09:30:29 -05: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
|
da25c48b2c
|
Merge pull request #13855 from Chiirno/paramedBoxOffice
Paramed office on box + Surgery remodel
|
2020-12-29 01:27:49 -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
|
042c7d9b8b
|
wew
|
2020-12-28 21:07:55 -08:00 |
|
silicons
|
d338d7a14b
|
auto
|
2020-12-28 21:03:50 -08: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
|
964b60c9ca
|
ok
|
2020-12-28 17:50:16 -08:00 |
|
silicons
|
ee9cc135f1
|
fix
|
2020-12-28 17:43:50 -08:00 |
|
silicons
|
abb37896a9
|
please work
|
2020-12-28 17:35:47 -08:00 |
|