shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,969 Commits 5 Branches 0 Tags
927b3787bf2ee8fbf7b6116f7d1fb64a673efe4b
Commit Graph

10092 Commits

Author SHA1 Message Date
deathride58
927b3787bf Merge pull request #6514 from Citadel-Station-13/upstream-merge-37412 
[MIRROR] Adds ckey to some of the ban prompts.
 2018-04-27 09:35:10 +00:00
deathride58
13c28b9ff1 Merge pull request #6513 from Citadel-Station-13/upstream-merge-37403 
[MIRROR] Adds grind_results to coins and diamonds
 2018-04-27 09:34:49 +00:00
deathride58
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
deathride58
62d64a8647 Merge pull request #6509 from Citadel-Station-13/upstream-merge-37402 
[MIRROR] Fixes autosurgeon icon
 2018-04-27 09:32:05 +00:00
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
e33dc09b83 Merge pull request #6495 from Citadel-Station-13/upstream-merge-37308 
[MIRROR] Desc fix
 2018-04-27 09:27:58 +00:00
deathride58
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
deathride58
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
deathride58
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
deathride58
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
LetterJay
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
LetterJay
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
LetterJay
df90ab6fb9 Merge pull request #6503 from Citadel-Station-13/upstream-merge-37371 
[MIRROR] GetFlatIcon fix
 2018-04-27 00:11:11 -05:00
LetterJay
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
LetterJay
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
LetterJay
d496d78169 Merge pull request #6486 from Poojawa/4-22-sync 
Hard TG Sync 4/22
 2018-04-27 00:08:38 -05:00
deathride58
132ae3a657 what the fuck is this shitcode 2018-04-26 09:28:34 -04:00
Nich
2a40af1bf2 Fixes a thing (#37427) 2018-04-25 13:29:13 -05:00
Dax Dupont
2d95013981 Adds ckey to some of the ban prompts. (#37412) 2018-04-25 09:23:46 -05:00
81Denton
d2885c84b7 adds grind_results to coins and diamonds (#37403) 2018-04-25 06:04:18 -05:00
Dax Dupont
4504014303 Improves messaging for blood contracts (#37391) 2018-04-25 05:58:58 -05:00
AnturK
e50b647ea4 Fixes autosurgeon icon (#37402) 
* Fixes autosurgeon icon

* Duh
 2018-04-24 16:03:33 -05:00
Jordan Brown
651b9510f9 Merge pull request #37390 from Mickyan/snacks_contents 
Adds salt to chips and jerky
 2018-04-24 15:55:12 -05:00
kevinz000
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
Dax Dupont
5014bdf6ee Improves logging/messaging for singularities. (#37411) 2018-04-24 10:19:14 -05:00
AnturK
1ba045e5f5 Fixes brain tumor. Again. (#37378) 2018-04-24 09:58:36 -05:00
Dax Dupont
e748439b15 Fixes duplicate logic causing doors to be perma stuck on mike pence mode. (#37379) 2018-04-24 08:14:12 -05:00
kevinz000
3c36c1acfc GetFlatIcon fix (#37371) 2018-04-24 07:20:39 -05:00
Dax Dupont
d5c2d37e39 Makes radiation collectors buildable (#37363) 
* Makes radiation collectors buildable

* capitalism at it's finest

* a
 2018-04-24 07:13:16 -05:00
Dax Dupont
a88caf87aa Fixes cargo scanner being invis. 2018-04-23 18:28:41 -05:00
81Denton
8fdc520031 Adds multilayer pipe subtypes for mapping (#37341) 
* adds multilayer pipe subtypes for mapping

* replaces values with defines
 2018-04-23 10:33:20 -05:00
Jordan Brown
8587e3f792 Merge pull request #37365 from DaxDupont/fueltank-logging 
Improves fuel tank explosion logging
 2018-04-23 09:40:55 -05:00
Jalleo
ac8b645461 Desc fix (#37308) 
* Removes a unused helper

* Fixes a description so people stop getting confused with certain mining upgrades.

* Updates to say research console.

* missed a dot.

* My bad.
 2018-04-23 09:20:15 -05:00
Noka
881331e232 test (#37263) 2018-04-23 09:06:42 -05:00
Jordan Brown
e52fafcbb7 Merge pull request #37364 from Jalleo/Inducer_change 
Removes the ability for inducers and circuits to charge energy weapons.
 2018-04-23 08:47:55 -05:00
vuonojenmustaturska
c7e3b72888 It started in a tavern on the edge of Macke town (#37362) 2018-04-23 07:35:09 -05:00
Poojawa
0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
Poojawa
832f071b59 mob stuff 2018-04-23 02:26:53 -05:00
AnturK
1d3f9bd4ec Fixes thermite immunities (#37359) 2018-04-23 02:06:22 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
Poojawa
cc6b320f83 game folder 2018-04-23 00:17:28 -05:00
Poojawa
e5f9765d2a datums/controller stuff 2018-04-23 00:02:42 -05:00
Poojawa
f2b0456dc5 defines, helpers, onclick 2018-04-22 23:56:25 -05:00
LetterJay
e97db8a33c Merge pull request #6481 from Citadel-Station-13/upstream-merge-37339 
[MIRROR] Fixes a lack of feedback when entering too many points for the gulag.
 2018-04-22 22:23:07 -05:00
LetterJay
86e3cac966 Merge pull request #6480 from Citadel-Station-13/upstream-merge-37324 
[MIRROR] Makes engine goggle numbers more visible
 2018-04-22 22:22:38 -05:00
LetterJay
fb267270ec Merge pull request #6478 from Citadel-Station-13/upstream-merge-37315 
[MIRROR] Gives beer and soda dispensers their own circuitboards and Design ID's
 2018-04-22 22:22:03 -05:00