Commit Graph

30200 Commits

Author SHA1 Message Date
SandPoot
374aa33013 Fix + updates 2022-01-07 23:21:48 -03:00
SandPoot
c0e1198702 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-05 18:25:05 -03: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
SandPoot
9694d84e14 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-02 20:56:15 -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
SandPoot
d46990f902 Finishing the strip menu 2021-12-31 14:26:32 -03:00
SandPoot
9a633b5395 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-31 14:07:43 -03:00
SandPoot
393c189779 Update rust-g and fix some resizing 2021-12-31 13:51:23 -03: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
BongaTheProto
b484927e55 Inverse milking moment (#216)
* smol micro runtime fix

:3

* blepppppp

lots of c

* Delete .NETFramework,Version=v4.0,Profile=Client.AssemblyAttributes.cs

* Delete UnstandardnessTestForDM.csproj.AssemblyReference.cache
2021-12-27 17:52:14 -03:00
TripleShades
0089b44df2 a 2021-12-23 17:57:15 -05:00
SandPoot
0b2b73381f size stuff 2021-12-22 15:22:25 -03:00
SandPoot
e27a6cda5c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-22 15:01:25 -03: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
SandPoot
0fe14f40a9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-20 12:29:55 -03: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
SandPoot
c9bf45dee1 emergency 2021-12-17 11:52:31 -03:00
SandPoot
17b369934c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-17 00:12:00 -03: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
SandPoot
24e342b7fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-16 10:33:03 -03:00
SandPoot
bb7d894944 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-15 17:33:44 -03:00
BongaTheProto
64c70711c2 fixes some runtimes (again) (#211) 2021-12-15 14:25:41 -03:00
DeltaFire
b3f0a74ff9 delay returns 2021-12-14 18:40:33 +01:00
SandPoot
bc21dc3acb quick-mess 2021-12-12 16:12:11 -03: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
SandPoot
72db0e8ef2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-11 17:20:05 -03:00
SandPoot
7b34851794 Adds functionality to dressers once again (#209) 2021-12-11 16:52:48 -03: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
SandPoot
67719f786d Sanity is now visible around your mood (#208) 2021-12-11 14:46:47 -03:00
SandPoot
b5419d0f91 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-11 00:33:47 -03: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
SandPoot
e21a8445e2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-10 14:53:39 -03: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