42d8d83ca2
Update preferences_savefile.dm
2021-05-08 01:52:55 +01:00
149cdeb9fd
Update preferences_savefile.dm
2021-05-08 01:34:43 +01:00
5e271c239f
conflict resolving caused runtimes
2021-05-08 01:31:44 +01:00
5bc33c222a
Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two
2021-05-08 01:28:23 +01:00
108ff3d2f4
Merge branch 'rp-markings-attempt-two' of https://github.com/timothyteakettle/Citadel-Station-13 into rp-markings-attempt-two
2021-05-08 01:27:22 +01:00
d36e82c1c1
Merge pull request #14691 from silicons/radiationmaybe
...
so i fixed radiation not going away but it fixed the race condition that let radioactive things.. actually stack so let's make chernobyl a thing again yay :)
2021-05-07 13:51:10 -05:00
54e12f2478
Merge pull request #14690 from silicons/firefighting_foam
...
some changes to firefighting foam, fixes vscode launch bat
2021-05-07 13:51:05 -05:00
2dc1c48cb7
Merge pull request #14692 from Citadel-Station-13/silicons-patch-29
...
WHY WOULD YOU MAKE ZEOLITES NOT WORK IN SMOKE AAAAAAAA
2021-05-07 13:50:35 -05:00
bb893383bc
Update _bodyparts.dm
2021-05-07 17:27:55 +01:00
0fb72497ff
color fix
2021-05-07 16:46:40 +01:00
bef9473fa1
more migration fixes and general bugfixes
2021-05-07 16:10:20 +01:00
5699da56c3
Automatic changelog generation for PR #14671 [ci skip]
2021-05-07 01:00:30 -05:00
a40bc38c53
Merge pull request #14671 from timothyteakettle/humans-with-digi-legs
...
lets humans have digi legs (and avian legs)
2021-05-07 01:00:27 -05:00
8acaf64343
Automatic changelog generation for PR #14687 [ci skip]
2021-05-07 00:54:55 -05:00
470f417a6b
Merge pull request #14687 from Arturlang/cum_blood_fixes
...
Fixes virus bottles being white
2021-05-07 00:54:53 -05:00
b305d3b55b
Automatic changelog compile [ci skip]
2021-05-07 00:17:01 +00:00
3b07164fb4
Update preferences_savefile.dm
2021-05-07 00:56:27 +01:00
f5e2d3de2c
Update preferences_savefile.dm
2021-05-07 00:44:44 +01:00
eab47bb6ae
Update preferences_savefile.dm
2021-05-07 00:43:33 +01:00
440a6633ea
Update preferences_savefile.dm
2021-05-07 00:37:33 +01:00
e95e4ed106
Update preferences_savefile.dm
2021-05-06 23:39:41 +01:00
b1f84f94db
Update body_markings.dm
2021-05-06 22:43:31 +01:00
80599201cf
better fix
2021-05-06 22:39:07 +01:00
cb12843a34
bugfix
2021-05-06 22:35:15 +01:00
646f7726f3
Merge branch 'rp-markings-attempt-two' of https://github.com/timothyteakettle/Citadel-Station-13 into rp-markings-attempt-two
2021-05-06 22:09:35 +01:00
eefabc9049
Update preferences.dm
2021-05-06 22:08:51 +01:00
cd0a0bbe5c
Update healing.dm
2021-05-06 03:02:46 -07:00
cb1e2f3730
thing
2021-05-06 02:09:06 -07:00
97dcfd0750
Update effects_foam.dm
2021-05-06 02:02:25 -07:00
6ac964b35a
e
2021-05-06 01:52:35 -07:00
a269e8bf03
migration fix
2021-05-06 01:51:17 +01:00
2b91cabd6e
Automatic changelog compile [ci skip]
2021-05-06 00:17:03 +00:00
bee9d9c047
support for the ridiculous thing i just did
2021-05-05 22:29:21 +01:00
d39a60dd6b
casually list the matrixes for several hundred sprites
2021-05-05 21:24:07 +01:00
e5646404d7
Fixes virus bottles being white
2021-05-05 21:34:53 +03:00
ea071bd031
comment
2021-05-05 18:28:55 +01:00
3c7137f951
what if we didnt break 90% of the game
2021-05-05 18:19:02 +01:00
ba71bb944a
im not crazy but this commit breaks 90% of the game
2021-05-05 18:11:05 +01:00
1664459b14
squash bugs
2021-05-05 15:26:56 +01:00
e939ce8c64
Automatic changelog compile [ci skip]
2021-05-05 00:16:12 +00:00
b2d8c980e4
task failed sucessfully
2021-05-05 00:54:44 +01:00
f816bba62a
bugfixes
2021-05-05 00:51:52 +01:00
4a90438b6f
Automatic changelog generation for PR #14680 [ci skip]
2021-05-04 01:45:49 -05:00
d7687c9f3a
Merge pull request #14680 from keronshb/shadowalkengraved
...
Prevents Nightmares from being pulled OUT of jaunt from vendors and engraved messages.
2021-05-04 00:45:47 -06:00
89f5717469
Automatic changelog generation for PR #14679 [ci skip]
2021-05-04 01:45:35 -05:00
7b78181ce3
Merge pull request #14679 from bunny232/Meta-atmos
...
Meta atmos Enhancement
2021-05-04 00:45:33 -06:00
1ce59b974c
Merge pull request #14676 from Bapldap/patch-2
...
lesspopcrates(this one works)
2021-05-04 00:45:12 -06:00
0f73f9d9fd
Automatic changelog generation for PR #14673 [ci skip]
2021-05-03 22:08:39 -05:00
45bc4fcb46
Merge pull request #14673 from TheObserver-sys/SovietCrate
...
Soviet Crates, now available!
2021-05-03 21:08:37 -06:00
2bf9c9d21f
Merge pull request #14678 from SandPoot/fancy-gateway
...
Ports #55624 from tgstation
2021-05-03 21:07:03 -06:00
Timothy Teakettle