Timothy Teakettle
5e271c239f
conflict resolving caused runtimes
2021-05-08 01:31:44 +01:00
Timothy Teakettle
5bc33c222a
Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two
2021-05-08 01:28:23 +01:00
Timothy Teakettle
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
Changelogs
dbb8d82d64
Automatic changelog compile [ci skip]
2021-05-08 00:17:45 +00:00
Lin and GitHub
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
Lin and GitHub
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
Lin and GitHub
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
timothyteakettle
bb893383bc
Update _bodyparts.dm
2021-05-07 17:27:55 +01:00
timothyteakettle
0fb72497ff
color fix
2021-05-07 16:46:40 +01:00
timothyteakettle
bef9473fa1
more migration fixes and general bugfixes
2021-05-07 16:10:20 +01:00
bunny232
94db1c3d46
Update DeltaStation2.dmm
2021-05-07 08:31:49 -04:00
bunny232 and GitHub
81ad7f9357
Merge pull request #1 from Citadel-Station-13/master
...
update
2021-05-07 08:00:31 -04:00
CitadelStationBot
5699da56c3
Automatic changelog generation for PR #14671 [ci skip]
2021-05-07 01:00:30 -05:00
Lin and GitHub
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
CitadelStationBot
8acaf64343
Automatic changelog generation for PR #14687 [ci skip]
2021-05-07 00:54:55 -05:00
Lin and GitHub
470f417a6b
Merge pull request #14687 from Arturlang/cum_blood_fixes
...
Fixes virus bottles being white
2021-05-07 00:54:53 -05:00
Changelogs
b305d3b55b
Automatic changelog compile [ci skip]
2021-05-07 00:17:01 +00:00
timothyteakettle
3b07164fb4
Update preferences_savefile.dm
2021-05-07 00:56:27 +01:00
timothyteakettle
f5e2d3de2c
Update preferences_savefile.dm
2021-05-07 00:44:44 +01:00
timothyteakettle
eab47bb6ae
Update preferences_savefile.dm
2021-05-07 00:43:33 +01:00
timothyteakettle
440a6633ea
Update preferences_savefile.dm
2021-05-07 00:37:33 +01:00
timothyteakettle
e95e4ed106
Update preferences_savefile.dm
2021-05-06 23:39:41 +01:00
Putnam
6c8fa56132
Adds make priority announcement verb
2021-05-06 15:10:36 -07:00
Putnam
8d96de6b03
More tweaks, whoops
2021-05-06 14:52:17 -07:00
timothyteakettle
b1f84f94db
Update body_markings.dm
2021-05-06 22:43:31 +01:00
timothyteakettle
80599201cf
better fix
2021-05-06 22:39:07 +01:00
timothyteakettle
cb12843a34
bugfix
2021-05-06 22:35:15 +01:00
Putnam
ecca9d788b
More supernova tweaks
2021-05-06 14:32:13 -07:00
timothyteakettle
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
timothyteakettle
eefabc9049
Update preferences.dm
2021-05-06 22:08:51 +01:00
Fabian
5eae6a3e43
I WILL NEVER STOP TRYING TO CHANGE THE MALF AI SOUNDS
...
Due to unforeseen circumstances I will be shitting my pants
2021-05-06 21:53:11 +02:00
silicons and GitHub
cd0a0bbe5c
Update healing.dm
2021-05-06 03:02:46 -07:00
silicons
cb1e2f3730
thing
2021-05-06 02:09:06 -07:00
silicons and GitHub
97dcfd0750
Update effects_foam.dm
2021-05-06 02:02:25 -07:00
silicons
6ac964b35a
e
2021-05-06 01:52:35 -07:00
SandPoot
6414b371f8
fancy description for the proc
2021-05-06 03:03:46 -03:00
SandPoot
6bd5707a63
found it
2021-05-06 02:50:32 -03:00
Timothy Teakettle
a269e8bf03
migration fix
2021-05-06 01:51:17 +01:00
Changelogs
2b91cabd6e
Automatic changelog compile [ci skip]
2021-05-06 00:17:03 +00:00
zerothebigboy
90930494d6
k
2021-05-05 18:43:11 -04:00
zerothebigboy
c8ebe720ec
k
2021-05-05 18:25:05 -04:00
Timothy Teakettle
bee9d9c047
support for the ridiculous thing i just did
2021-05-05 22:29:21 +01:00
SandPoot
9cf04467a7
upload files
2021-05-05 17:55:30 -03:00
Timothy Teakettle
d39a60dd6b
casually list the matrixes for several hundred sprites
2021-05-05 21:24:07 +01:00
Artur
e5646404d7
Fixes virus bottles being white
2021-05-05 21:34:53 +03:00
Timothy Teakettle
ea071bd031
comment
2021-05-05 18:28:55 +01:00
Timothy Teakettle
3c7137f951
what if we didnt break 90% of the game
2021-05-05 18:19:02 +01:00
Timothy Teakettle
ba71bb944a
im not crazy but this commit breaks 90% of the game
2021-05-05 18:11:05 +01:00
Timothy Teakettle
1664459b14
squash bugs
2021-05-05 15:26:56 +01:00
zerothebigboy
f4af7bb28f
ihatetheantichrist
2021-05-05 06:39:21 -04:00
Timothy Teakettle