 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 |
|
|
Lin
|
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 |
|
|
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 |
|
|
Lin
|
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 |
|
|
Lin
|
470f417a6b
|
Merge pull request #14687 from Arturlang/cum_blood_fixes
Fixes virus bottles being white
|
2021-05-07 00:54:53 -05: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 |
|
|
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 |
|
|
silicons
|
6ac964b35a
|
e
|
2021-05-06 01:52:35 -07:00 |
|
|
Timothy Teakettle
|
a269e8bf03
|
migration fix
|
2021-05-06 01:51:17 +01:00 |
|
|
Timothy Teakettle
|
bee9d9c047
|
support for the ridiculous thing i just did
|
2021-05-05 22:29:21 +01: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 |
|
|
timothyteakettle
|
b2d8c980e4
|
task failed sucessfully
|
2021-05-05 00:54:44 +01:00 |
|
|
timothyteakettle
|
f816bba62a
|
bugfixes
|
2021-05-05 00:51:52 +01:00 |
|
|
silicons
|
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 |
|
|
silicons
|
1ce59b974c
|
Merge pull request #14676 from Bapldap/patch-2
lesspopcrates(this one works)
|
2021-05-04 00:45:12 -06:00 |
|
|
silicons
|
45bc4fcb46
|
Merge pull request #14673 from TheObserver-sys/SovietCrate
Soviet Crates, now available!
|
2021-05-03 21:08:37 -06:00 |
|
|
silicons
|
2bf9c9d21f
|
Merge pull request #14678 from SandPoot/fancy-gateway
Ports #55624 from tgstation
|
2021-05-03 21:07:03 -06:00 |
|
|
timothyteakettle
|
7265c7111c
|
new limb covering var for markings
|
2021-05-03 22:47:22 +01:00 |
|
|
timothyteakettle
|
fac2b259ac
|
big changes 2
|
2021-05-03 22:43:45 +01:00 |
|
|
timothyteakettle
|
f4bb5255ab
|
Revert "big changes"
This reverts commit 7ac50b7ba2.
|
2021-05-03 22:43:32 +01:00 |
|
|
timothyteakettle
|
7ac50b7ba2
|
big changes
|
2021-05-03 22:43:22 +01:00 |
|
|
keronshb
|
834ec62c0b
|
Nightmare Jaunt Change
Prevents Nightmares from being pulled OUT of jaunt from vendors and engraved messages.
|
2021-05-03 00:05:39 -04:00 |
|
|
SandPoot
|
8f3a44f44a
|
fancy gateway
|
2021-05-02 18:57:04 -03:00 |
|
|
Timothy Teakettle
|
93254f5d9c
|
Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two
|
2021-05-02 22:20:57 +01:00 |
|
|
Timothy Teakettle
|
d32770a0fa
|
test
|
2021-05-02 22:19:41 +01:00 |
|
|
Timothy Teakettle
|
2daed9250f
|
some bugfixes
|
2021-05-02 18:30:35 +01:00 |
|
|
Bapldap
|
aefa9eb292
|
lesspopcrates
less population required for surplus crates, everyone loves them. I don't see how this could affect gameplay in any negative way :)
|
2021-05-01 22:31:24 -05:00 |
|
|
Timothy Teakettle
|
7efadade15
|
href fix
|
2021-05-01 20:55:13 +01:00 |
|
|
Timothy Teakettle
|
8aed1b4236
|
more color code
|
2021-05-01 20:37:22 +01:00 |
|
|
Timothy Teakettle
|
ddc3e3b3b2
|
Update preferences.dm
|
2021-05-15 21:24:20 +01:00 |
|
|
The0bserver
|
f1109c4f67
|
what a crate day (initial commit)
|
2021-05-01 02:15:07 -04:00 |
|
|
Timothy Teakettle
|
ac504d679b
|
digi humans
|
2021-04-30 14:07:44 +01:00 |
|
|
Lin
|
c80c974b6c
|
Merge pull request #14668 from qweq12yt/fix-riot-suit
[Fix] Restores the Sprite for the Riot Suit
|
2021-04-29 22:24:00 -05:00 |
|
|
silicons
|
e3755fba92
|
Merge pull request #14639 from necromanceranne/cyberorgan_stuff_ye
Ports a significant amount of the tg cybernetic organ code + more
|
2021-04-28 21:20:57 -06:00 |
|
|
silicons
|
986aef27b2
|
Merge pull request #14648 from SandPoot/decal-painter-tgui
Decal Painter menu is no longer shit and has visible previews.
|
2021-04-28 21:20:24 -06:00 |
|
|
silicons
|
cb0574a560
|
Merge pull request #14649 from TheObserver-sys/BulletPass
TRADE OFFER: YOU GIVE ME 30000 PLASMA. I GIVE YOU A SINGLE MAGAZINE OF 10MM INCINDIARY AMMO
|
2021-04-28 21:17:55 -06:00 |
|