shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,719 Commits 5 Branches 0 Tags
04d806c70001e2ffb705ca96b034e779ed8bb06c
Commit Graph

6256 Commits

Author SHA1 Message Date
silicons
9205545d16 Merge pull request #15317 from LetterN/what-should-i-name-this-branch 
TGUI hardsync & stuff
 2022-01-25 00:06:59 -08:00
silicons
f601580854 Merge pull request #15430 from DeltaFire15/synth-coolant 
Synth stuff : Balancing Nightmare Edition (aka, coolant)
 2022-01-22 13:59:12 -08:00
LetterN
7e326ed947 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-22 20:42:55 +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
LetterN
18b7069f1f Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-11 09:49:38 +08: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
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
DeltaFire
074fe5b417 a bunch of stuff 
5° min temp adjustment for active cooling
150% max total cooling efficiency as opposed to 100%
passive heating cools instead at >100% efficiency (to -30°C min)
EMPs jam cooling system readouts.
Nanogel is now printable, for a decent price though it needs a bit of diamond.
 2022-01-02 19:44:35 +01:00
Hatterhat
cd0c2aa496 your jordans are fake 2022-01-02 04:33:25 -06: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
LetterN
fab4b07be5 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-12-21 07:59:33 +08:00
SandPoot
67cfd000fe Upload files 2021-12-16 12:57:21 -03:00
DeltaFire
0faac6dce6 hoo boy 2021-12-14 23:06:42 +01:00
DeltaFire
50be57f107 grrrr 2021-12-08 18:33:06 +01:00
DeltaFire
04797a961b linters b gone 2021-12-08 05:07:22 +01:00
Lin
e506bc50dc Merge pull request #15335 from DeltaFire15/synth-chem-time 
Synth / IPC kinda-buffs - Chemwarfare Edition
 2021-12-01 00:39:02 +00:00
Lin
5dc9704e5d Merge pull request #15380 from DeltaFire15/oops-all-wounds 
Block & Pellet wound pass
 2021-11-30 20:24:42 +00:00
Linzolle
afe81f711b Merge branch 'winterball2021' of github.com:keronshb/Citadel-Station-13 into winterball 2021-11-26 18:46:57 -07:00
Lin
d5c17f0d84 Merge pull request #15376 from SandPoot/double 
Double beds
 2021-11-24 17:38:10 +00:00
Lin
e3a5391250 Merge pull request #14868 from Arturlang/admin_mapsave 
buildmode mapgen tool save [ready]
 2021-11-24 17:32:48 +00:00
Chayse Ramsay
31a0de04d5 Fixes chem nades too, since fixing grenades as a whole broke them changing timer 2021-11-21 06:24:55 +00:00
Chayse Ramsay
9545b180c6 Update grenade.dm 2021-11-21 06:08:20 +00:00
LetterN
8dcfea5817 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-21 10:34:14 +08:00
keronshb
af83fb9611 FestiveMap 2021 2021-11-20 12:04:35 -05:00
Lin
1de965a90e Merge pull request #15385 from buffyuwu/crayons.dm 
dont color my entire canvas neon green when im painting please
 2021-11-20 03:36:38 +00:00
Lin
d395824007 Merge pull request #15383 from MrJWhit/thinnining-trash 
Thins up the loot piles
 2021-11-20 03:35:56 +00:00
Artur
99dedb54ed Merge remote-tracking branch 'upstream/master' into admin_mapsave 2021-11-20 00:16:56 +02:00
Putnam3145
cf4cc39a3b Merge pull request #15222 from raspy-on-osu/apcfix 
save hours of pain for new engineers with this one simple trick!! click here to find out
 2021-11-18 20:18:11 -08:00
buffyuwu
612087f7e5 Update crayons.dm 2021-11-18 20:44:01 -05:00
MrJWhit
47cf0c153a Update loot_pile.dm 2021-11-17 18:36:49 -05:00
Lin
efa02148d1 Merge pull request #15275 from keronshb/halloweenball2021 
Spookystation (Ball Map) and Vector Cars
 2021-11-17 16:26:07 +00:00
DeltaFire
ef9c90d512 embeds, unarmed and wounds 2021-11-16 20:26:38 +01:00
LetterN
fa6946fae4 added the funny. Also adds balloon_alert to more stuff (primarily atmos) 2021-11-16 16:10:12 +08:00
Putnam3145
1da28b8ec6 Chem gas tweaks, + toxins rebalance 2021-11-15 16:29:30 -08:00
SandPoot
ca3eaca314 update bedsheet_bin.dm 2021-11-15 20:48:11 -03:00
SandPoot
5b85c260a7 Upload files 2021-11-15 01:34:30 -03:00
DeltaFire
6224da71a3 contents_explosion 
at least this one had less overrides.
 2021-11-14 21:41:42 +01:00
DeltaFire
6aa906395c not a gaius reference 
hhhh let me just replace all the ex_acts missing some args and adjust them
 2021-11-14 21:34:59 +01:00
LetterN
eb98848a9f wires this code to the PROPER prefs 2021-11-14 09:23:08 +08:00
DeltaFire
b4e6b0785d chemscan 
chemscanning (reads: health analyzers mostly) show reagents in grey if not processable due to being invalid
 2021-11-12 19:38:10 +01:00
LetterN
8b16653744 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-12 08:50:23 +08:00
keronshb
0aceecee2e w hitsound 2021-11-10 16:49:18 -05:00
LetterN
9a24f89780 THE fix 2021-11-10 10:33:15 +08:00
silicons
5b5eca2beb Merge pull request #15322 from SandPoot/crayon-precision 
Crayon precision mode
 2021-11-09 09:56:03 -08:00
Lin
74c6e05dd7 Merge pull request #15318 from silicons/evil 
removes some evil defines from the code
 2021-11-04 04:32:48 +00:00
keronshb
efd12e4fd5 Changes for merge 2021-11-01 12:07:44 -04:00
SandPoot
d92a290960 Update crayons.dm 2021-11-01 01:50:30 -03:00