shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,676 Commits 5 Branches 0 Tags
7e326ed947dd6b71a32e15f8dcf9360afefef01b
Commit Graph

29554 Commits

Author SHA1 Message Date
LetterN 7e326ed947 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-22 20:42:55 +08:00
silicons f3332f8607 Merge pull request #15470 from Putnam3145/trit-messed-up 
Fixes trit/hydrogen fires to have right products
 2022-01-22 04:38:11 -08:00
silicons f85d0dbda0 Merge pull request #15449 from Putnam3145/gib-podpeople 
Allows pod people to be made using other fluids
 2022-01-22 04:34:59 -08:00
silicons a7993cd916 Merge pull request #15419 from Putnam3145/funny-atmos-event 
Adds an event that speeds up/slows down atmos
 2022-01-22 04:34:42 -08:00
silicons 2b726d7670 Merge pull request #15324 from Trilbyspaceclone/ashtree 
Ashen tree!
 2022-01-22 04:34:28 -08:00
LetterN 7eb5e4a835 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-18 11:46:16 +08:00
Putnam3145 ece671087f Added a bit of enthalpy to tritium 2022-01-13 20:30:26 -08:00
Putnam3145 b1d05d4956 Fixes hydrogen fires to have right products 2022-01-13 20:25:53 -08:00
Lin ad4df56506 Merge pull request #15465 from Putnam3145/supernova-rad-nerf 
Supernova rad storm tweaks
 2022-01-13 16:53:54 +00:00
Putnam3145 ef3e6923f8 Added more logging for climax-in-container 2022-01-11 17:39:50 -08:00
Putnam3145 5f7ef21a7c More supernova tweaks 2022-01-10 21:56:48 -08:00
LetterN 958b0ef583 dupe defines bad 2022-01-11 10:01:35 +08:00
LetterN 18b7069f1f Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-11 09:49:38 +08:00
Hatterhat 0077f682fd crusher gauntlets - resonator hitsound, sharpness to SHARP_NONE (#15458) 
* boo womp

* wrongsonator

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
 2022-01-09 18:46:48 +01:00
Lin d7cbb017f6 Fix few instances of bleeding white blood (#15398) 
* no longer bleed white blood

* parentheses man

* fix that one bdm map spawn too
 2022-01-09 17:23:48 +01:00
silicons 4de727ce6e Update SDQL_2.dm (#15462) 2022-01-09 16:59:29 +01:00
Putnam3145 620025ec07 Makes drunkenness work properly again (#15463) 2022-01-09 16:26:37 +01:00
Lin 8c0d78169b Merge pull request #15453 from SandPoot/back-internals 
Adds the possibility to toggle internals on back slot
 2022-01-04 19:00:17 +00:00
Lin 41be63dbbc Merge pull request #15452 from Hatterhat/jump-timbs 
your jordans are fake - adds a mining boot skin for jumpboots
 2022-01-03 22:34:38 +00:00
Lin 2379a2a342 Merge pull request #15370 from Putnam3145/genericized-plasma-trit 
Total fire overhaul + new atmos stuff + uh oh stinky toxins nerf + sauna buff + ??
 2022-01-03 22:31:40 +00:00
SandPoot 33fc2254f1 Update carbon_stripping.dm 2022-01-03 03:05:30 -03:00
Hatterhat cd0c2aa496 your jordans are fake 2022-01-02 04:33:25 -06:00
silicons c63489abe4 Update say.dm (#15451) 2022-01-02 01:57:58 +01:00
Putnam3145 c97d09c0ad Fixes bluespace pipes (I think) (#15437) 2022-01-01 19:48:03 +01:00
DeltaFire 2940d141cf please-dont-smite-us-lummox 2022-01-01 07:10:35 +01:00
Putnam3145 c392b7c3fb Allows pod people to be made using other fluids 2021-12-31 14:36:55 -08:00
SandPoot 8510dcc08a Ports tgui stripping (finally) (#15401) 
* Upload files

* Update items.dm

* Update files

* Update files

* Update strippable.dm

* Update strippable

* Update strippable.dm

* Upload files

* Update files

* Update files

* Update files

* update files

* Update files

* Update dog.dm

* Update strippable.dm

* Update equipping

* Update strippable.d

* Upload files

* Upload files

* Update monkey.dm
 2021-12-30 07:40:15 +01:00
Lin 0ba9f4254c Merge pull request #15435 from TripleShades/aaaaa 
Festive Station Fixes
 2021-12-28 21:35:28 +00:00
TripleShades 0089b44df2 a 2021-12-23 17:57:15 -05:00
Putnam3145 f61b638a9e Fixes excited group process delay heuristic (#15420) 2021-12-22 17:38:48 +01:00
Putnam3145 97051cad80 Fixes chem gases being added twice 2021-12-22 01:27:53 -08:00
Putnam3145 b83ec40766 Fixes way too much gas being breathed 2021-12-22 01:27:40 -08:00
Lin 34dbb91d9e Merge pull request #15433 from Citadel-Station-13/chem_synth 
fixes debug chemical synthesizers
 2021-12-21 17:22:16 +00:00
LetterN fab4b07be5 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-12-21 07:59:33 +08:00
Putnam3145 a6837e33ff Added hydrogen to contaminated 2021-12-20 00:45:20 -08:00
silicons 03e8c32acd Merge pull request #15402 from Linzolle/pinremoval 
finally change pin removal from crafting to tools
 2021-12-19 18:54:50 -08:00
TripleShades 226a299aff Update dirt.dm 2021-12-19 17:29:01 -05:00
silicons 555477a075 Update chem_synthesizer.dm 2021-12-18 09:18:23 -07:00
silicons cc11cae967 Update chem_synthesizer.dm 2021-12-18 09:17:18 -07:00
Lin 18cdbb9d5f Merge pull request #15432 from SandPoot/assemblies 
Fixes assemblies
 2021-12-16 20:56:32 +00:00
SandPoot 67cfd000fe Upload files 2021-12-16 12:57:21 -03:00
DeltaFire b3f0a74ff9 delay returns 2021-12-14 18:40:33 +01:00
silicons 72a169e336 Merge pull request #15426 from Putnam3145/better-science-log 
Fixes science per-minute output
 2021-12-11 17:46:22 -08:00
Putnam3145 13834847e0 it works better when you're actually using a delta 2021-12-11 17:04:05 -08:00
Lin f89729afb7 Merge pull request #15421 from DeltaFire15/more_overrides 
Fixes even more linter stuff
 2021-12-11 18:08:33 +00:00
DeltaFire 5b2f9c0745 oop 2021-12-11 18:59:02 +01:00
Lin d2a91c37b7 Merge pull request #15415 from bunny232/master 
The pool's safe temperatures are now within a somewhat reasonable range.
 2021-12-10 18:42:52 +00:00
Lin bb1de6070e Merge pull request #15416 from bunny232/tempfeel 
Hey what if cold blooded people didn't get a permanent too-hot alert if their body is the same temperature as the air around them
 2021-12-10 17:44:48 +00:00
Lin c7d4c29a37 Merge pull request #15422 from Putnam3145/gases-fix-what 
Removes a redundant variable declaration
 2021-12-10 17:44:13 +00:00
Lin c1dc8b2c2a Merge pull request #15418 from Putnam3145/better-science-log 
Makes science points show actual change in last minute instead of just passive gen
 2021-12-10 03:46:06 +00:00