shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,978 Commits 5 Branches 0 Tags
3bb8902846feea357570e589faffc528d7107023
Commit Graph

15978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58 3bb8902846 Merge pull request #6518 from Citadel-Station-13/upstream-merge-37413 
[MIRROR] Gives admins the D(say) hotkey + fixes buildmode permissions
 2018-04-27 09:36:44 +00:00
deathride58 5172d2ae09 Merge pull request #6517 from Citadel-Station-13/upstream-merge-37416 
[MIRROR] Fixes the stock market having random, spontaneous exponential value spikes.
 2018-04-27 09:36:23 +00:00
deathride58 2ee4d3e77d Merge pull request #6515 from Citadel-Station-13/upstream-merge-37326 
[MIRROR] Removes SCP_294
 2018-04-27 09:35:43 +00:00
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 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
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
CitadelStationBot 89e34cb0cc Gives admins the D(say) hotkey + fixes buildmode permissions 2018-04-25 21:40:05 -05:00
Dax Dupont d0266b01cd Gives admins the D(say) hotkey + fixes buildmode permissions (#37413) 2018-04-25 21:40:05 -05:00
deathride58 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 096ddb70ba Fixes the stock market having random, spontaneous exponential value spikes. 2018-04-25 13:44:43 -05:00
Jordan Brown c340d2c9aa Merge pull request #37416 from deathride58/fixesexponentialstockmarket 
Fixes the stock market having random, spontaneous exponential value spikes.
 2018-04-25 13:44:43 -05: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
Nich 2a40af1bf2 Fixes a thing (#37427) 2018-04-25 13:29:13 -05:00
CitadelStationBot 09f245ae90 Removes SCP_294 2018-04-25 10:05:57 -05:00
Armhulen 17aa0acef8 Removes SCP_294 (#37326) 
* aaah sweet essence

* bye bye sprites

* goodbye machine code

* bye bye blacklist entry

* whoops

* scp gone from runtime

* bye bye ract

* bye bye space ruin folder

* bye bye area
 2018-04-25 10:05:57 -05:00
CitadelStationBot fa34c339c3 Adds ckey to some of the ban prompts. 2018-04-25 09:23:46 -05:00
Dax Dupont 2d95013981 Adds ckey to some of the ban prompts. (#37412) 2018-04-25 09:23:46 -05:00
CitadelStationBot 52afbb9570 Adds grind_results to coins and diamonds 2018-04-25 06:04:19 -05:00
81Denton d2885c84b7 adds grind_results to coins and diamonds (#37403) 2018-04-25 06:04:18 -05:00
CitadelStationBot 6f65262e6e Improves messaging for blood contracts 2018-04-25 05:58:59 -05:00
Dax Dupont 4504014303 Improves messaging for blood contracts (#37391) 2018-04-25 05:58:58 -05:00
CitadelStationBot 8ccd61f6bc Fixes autosurgeon icon 2018-04-24 16:03:34 -05:00
AnturK 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 Brown 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
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
CitadelStationBot 5df9e140d2 Improves logging/messaging for singularities. 2018-04-24 10:19:15 -05:00
Dax Dupont 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
AnturK 1ba045e5f5 Fixes brain tumor. Again. (#37378) 2018-04-24 09:58:36 -05:00