shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,489 Commits 5 Branches 0 Tags
b11e600cff1cf8d2e73f2f110a787dba4df8756a
Commit Graph

10392 Commits

Author SHA1 Message Date
MrDoomBringer
18716c03a5 Analyzers show temperature in Kelvin as well as Celsius now (#37441) 
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* wew

* nicbn
 2018-04-27 02:28:21 -05:00
Armhulen
da1ac395c2 ok! (#37439) 2018-04-27 02:28:13 -05:00
KorPhaeron
ec080ab80b Paperwork Error Event (#37443) 
* Paperwork Error Event

* Condense the proc

* Properly calls set_overflow_role
 2018-04-27 00:58:24 -05: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
Jordan Brown
4254104676 Merge pull request #37337 from ninjanomnom/buildmode-picker 
Adds a picker tool to advanced buildmode
 2018-04-26 15:26:48 -05:00
Jordan Brown
5994a9fd0b Merge pull request #37342 from ninjanomnom/vis-border 
Makes it possible to see tiles past z transitions
 2018-04-26 15:25:36 -05:00
Jordan Brown
4838bfec4e Merge pull request #37407 from Fox-McCloud/circuits-reagents 
Removes Acid from Remaining Circuits
 2018-04-26 15:24:26 -05:00
Jordan Brown
354dc0bcf9 Merge pull request #37431 from Mickyan/anemic 
New Trait: Acute Blood Deficiency
 2018-04-26 15:21:11 -05:00
deathride58
132ae3a657 what the fuck is this shitcode 2018-04-26 09:28:34 -04:00
Dax Dupont
9015cdf172 Makes the experimentor only output one copy of something. (#37313) 2018-04-26 08:01:46 -05:00
Dax Dupont
d0266b01cd Gives admins the D(say) hotkey + fixes buildmode permissions (#37413) 2018-04-25 21:40:05 -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
Nich
2a40af1bf2 Fixes a thing (#37427) 2018-04-25 13:29:13 -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
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
Jordan Brown
f0a259d3e5 Removes redundant COMPONENT_INCOMPATIBLE crashes 2018-04-25 05:54:41 -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
1cdea15616 Fixes ghosts being unable to see into nonadjacent bags 2018-04-23 09:03:27 -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
Jordan Brown
0127fa02cd Fixes toolbelts holding everything 2018-04-23 08:30:08 -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