 deathride58andGitHub
|
6d8ade932d
|
Update lockon_aiming.dm
|
2018-04-27 05:33:37 -04:00 |
|
|
deathride58andGitHub
|
d37ff6135a
|
Merge branch 'master' into upstream-merge-37389
|
2018-04-27 09:32:54 +00:00 |
|
|
deathride58andGitHub
|
bf26599ac3
|
Merge pull request #6512 from Citadel-Station-13/upstream-merge-37391
[MIRROR] Improves messaging for blood contracts
|
2018-04-27 09:32:21 +00:00 |
|
|
deathride58andGitHub
|
62d64a8647
|
Merge pull request #6509 from Citadel-Station-13/upstream-merge-37402
[MIRROR] Fixes autosurgeon icon
|
2018-04-27 09:32:05 +00:00 |
|
|
deathride58andGitHub
|
48a5639f8a
|
Merge pull request #6508 from Citadel-Station-13/upstream-merge-37390
[MIRROR] Adds salt to chips and jerky
|
2018-04-27 09:31:23 +00:00 |
|
|
deathride58andGitHub
|
f8406d1bfe
|
Merge pull request #6507 from Citadel-Station-13/upstream-merge-37375
[MIRROR] fixes cqc working outside chef assigned areas
|
2018-04-27 09:31:04 +00:00 |
|
|
deathride58andGitHub
|
5a399f4ce9
|
Merge pull request #6506 from Citadel-Station-13/upstream-merge-37411
[MIRROR] Improves logging/messaging for singularities.
|
2018-04-27 09:30:18 +00:00 |
|
|
deathride58andGitHub
|
909be55c5f
|
Merge pull request #6497 from Citadel-Station-13/upstream-merge-37341
[MIRROR] Adds multilayer pipe subtypes for mapping
|
2018-04-27 09:29:04 +00:00 |
|
|
deathride58andGitHub
|
a44347f6e8
|
Merge pull request #6496 from Citadel-Station-13/upstream-merge-37365
[MIRROR] Improves fuel tank explosion logging
|
2018-04-27 09:28:16 +00:00 |
|
|
deathride58andGitHub
|
e33dc09b83
|
Merge pull request #6495 from Citadel-Station-13/upstream-merge-37308
[MIRROR] Desc fix
|
2018-04-27 09:27:58 +00:00 |
|
|
deathride58andGitHub
|
35cc70dd04
|
Merge pull request #6494 from Citadel-Station-13/upstream-merge-37263
[MIRROR] 's is no longer a dirty reminder of snake lisps for the traumatized (phobia regex fix)
|
2018-04-27 09:27:29 +00:00 |
|
|
deathride58andGitHub
|
35e8ac1240
|
Merge pull request #6492 from Citadel-Station-13/upstream-merge-37364
[MIRROR] Removes the ability for inducers and circuits to charge energy weapons.
|
2018-04-27 09:21:07 +00:00 |
|
|
deathride58andGitHub
|
00ef1a9f84
|
Merge pull request #6488 from Citadel-Station-13/upstream-merge-37362
[MIRROR] Replaces plant/peel Crossed procs with the slippery component, where needed
|
2018-04-27 09:18:15 +00:00 |
|
|
deathride58andGitHub
|
c17d48affe
|
Merge pull request #6485 from Citadel-Station-13/upstream-merge-37359
[MIRROR] Fixes thermite immunities [s]
|
2018-04-27 09:17:43 +00:00 |
|
|
LetterJayandGitHub
|
d679d27766
|
Merge pull request #6505 from Citadel-Station-13/upstream-merge-37378
[MIRROR] Fixes brain tumor. Again.
|
2018-04-27 00:12:14 -05:00 |
|
|
LetterJayandGitHub
|
4647168c78
|
Merge pull request #6504 from Citadel-Station-13/upstream-merge-37379
[MIRROR] Fixes duplicate logic causing doors to be perma stuck on shock mode.
|
2018-04-27 00:11:59 -05:00 |
|
|
LetterJayandGitHub
|
df90ab6fb9
|
Merge pull request #6503 from Citadel-Station-13/upstream-merge-37371
[MIRROR] GetFlatIcon fix
|
2018-04-27 00:11:11 -05:00 |
|
|
LetterJayandGitHub
|
72ddaee4a3
|
Merge pull request #6502 from Citadel-Station-13/upstream-merge-37363
[MIRROR] Makes radiation collectors buildable
|
2018-04-27 00:10:52 -05:00 |
|
|
LetterJayandGitHub
|
32b5e75135
|
Merge pull request #6501 from Citadel-Station-13/upstream-merge-37404
[MIRROR] Remove rusty from tgs3.json
|
2018-04-27 00:09:43 -05:00 |
|
|
LetterJayandGitHub
|
a4bc2c0b95
|
Merge pull request #6500 from Citadel-Station-13/upstream-merge-37398
[MIRROR] Fixes cargo scanner being invis.
|
2018-04-27 00:09:17 -05:00 |
|
|
LetterJayandGitHub
|
d496d78169
|
Merge pull request #6486 from Poojawa/4-22-sync
Hard TG Sync 4/22
|
2018-04-27 00:08:38 -05:00 |
|
|
deathride58andGitHub
|
132ae3a657
|
what the fuck is this shitcode
|
2018-04-26 09:28:34 -04:00 |
|
|
deathride58andGitHub
|
5b035581f0
|
Merge pull request #6516 from Citadel-Station-13/upstream-merge-37427
[MIRROR] [S] Fixes an exploit that allows you to print any object using the circuit printer
|
2018-04-25 19:10:05 +00:00 |
|
|
CitadelStationBot
|
cab5a3dce1
|
[S] Fixes an exploit that allows you to print any object using the circuit printer
|
2018-04-25 13:29:13 -05:00 |
|
|
NichandCitadelStationBot
|
2a40af1bf2
|
Fixes a thing (#37427)
|
2018-04-25 13:29:13 -05:00 |
|
|
CitadelStationBot
|
6f65262e6e
|
Improves messaging for blood contracts
|
2018-04-25 05:58:59 -05:00 |
|
|
Dax DupontandCitadelStationBot
|
4504014303
|
Improves messaging for blood contracts (#37391)
|
2018-04-25 05:58:58 -05:00 |
|
|
Jordan BrownandCitadelStationBot
|
f0a259d3e5
|
Removes redundant COMPONENT_INCOMPATIBLE crashes
|
2018-04-25 05:54:41 -05:00 |
|
|
CitadelStationBot
|
8ccd61f6bc
|
Fixes autosurgeon icon
|
2018-04-24 16:03:34 -05:00 |
|
|
AnturKandCitadelStationBot
|
e50b647ea4
|
Fixes autosurgeon icon (#37402)
* Fixes autosurgeon icon
* Duh
|
2018-04-24 16:03:33 -05:00 |
|
|
CitadelStationBot
|
b3316f6b02
|
Adds salt to chips and jerky
|
2018-04-24 15:55:13 -05:00 |
|
|
Jordan BrownandCitadelStationBot
|
651b9510f9
|
Merge pull request #37390 from Mickyan/snacks_contents
Adds salt to chips and jerky
|
2018-04-24 15:55:12 -05:00 |
|
|
CitadelStationBot
|
e9b00c6ac0
|
fixes cqc working outside chef assigned areas
|
2018-04-24 10:23:34 -05:00 |
|
|
kevinz000andCitadelStationBot
|
42d0541a28
|
fixes cqc working outside chef assigned areas (#37375)
* cqc
* Update martial.dm
* Update cqc.dm
* Update cqc.dm
* Update human_defense.dm
* Update human_defense.dm
* Update human_defense.dm
|
2018-04-24 10:23:34 -05:00 |
|
|
CitadelStationBot
|
5df9e140d2
|
Improves logging/messaging for singularities.
|
2018-04-24 10:19:15 -05:00 |
|
|
Dax DupontandCitadelStationBot
|
5014bdf6ee
|
Improves logging/messaging for singularities. (#37411)
|
2018-04-24 10:19:14 -05:00 |
|
|
CitadelStationBot
|
2f9f2684dd
|
Fixes brain tumor. Again.
|
2018-04-24 09:58:37 -05:00 |
|
|
AnturKandCitadelStationBot
|
1ba045e5f5
|
Fixes brain tumor. Again. (#37378)
|
2018-04-24 09:58:36 -05:00 |
|
|
CitadelStationBot
|
1a5e46ca1e
|
Fixes duplicate logic causing doors to be perma stuck on shock mode.
|
2018-04-24 08:14:12 -05:00 |
|
|
Dax DupontandCitadelStationBot
|
e748439b15
|
Fixes duplicate logic causing doors to be perma stuck on mike pence mode. (#37379)
|
2018-04-24 08:14:12 -05:00 |
|
|
CitadelStationBot
|
3bc56f5723
|
GetFlatIcon fix
|
2018-04-24 07:20:40 -05:00 |
|
|
kevinz000andCitadelStationBot
|
3c36c1acfc
|
GetFlatIcon fix (#37371)
|
2018-04-24 07:20:39 -05:00 |
|
|
CitadelStationBot
|
5299a24587
|
Makes radiation collectors buildable
|
2018-04-24 07:13:16 -05:00 |
|
|
Dax DupontandCitadelStationBot
|
d5c2d37e39
|
Makes radiation collectors buildable (#37363)
* Makes radiation collectors buildable
* capitalism at it's finest
* a
|
2018-04-24 07:13:16 -05:00 |
|
|
CitadelStationBot
|
0702ed85d7
|
Remove rusty from tgs3.json
|
2018-04-24 04:21:37 -05:00 |
|
|
Kyle Spier-SwensonandCitadelStationBot
|
da527e2742
|
Remove rusty from tgs3.json (#37404)
|
2018-04-24 04:21:37 -05:00 |
|
|
Poojawa
|
45b1869666
|
fixes some rushed mapping issues.
|
2018-04-23 20:47:11 -05:00 |
|
|
CitadelStationBot
|
4d3ebbc02e
|
Fixes cargo scanner being invis.
|
2018-04-23 18:28:41 -05:00 |
|
|
Dax DupontandCitadelStationBot
|
a88caf87aa
|
Fixes cargo scanner being invis.
|
2018-04-23 18:28:41 -05:00 |
|
|
CitadelStationBot
|
c6436ff3ac
|
Adds multilayer pipe subtypes for mapping
|
2018-04-23 10:33:20 -05:00 |
|