Commit Graph

20708 Commits

Author SHA1 Message Date
SandPoot
54641ce201 send 2023-01-23 20:44:28 -03:00
silicons
e292452aae Merge pull request #15908 from Hatterhat/glasses
loadout - glasses and price adjustments
2023-01-07 14:10:35 -08:00
silicons
35497b250f Merge pull request #15914 from Hatterhat/conveyor-sorter
[good to go] conveyor sorters, conveyor switch tool interacts, also makes mechs not explode on sale
2023-01-07 14:09:55 -08:00
silicons
23327fa268 Merge pull request #15894 from JerryWester/modsuits
MODsuits
2023-01-07 14:07:28 -08:00
SandPoot
535c1c623e Merge pull request #15896 from LeDrascol/fix-machine-init-process
Fix init_process not preventing processing
2023-01-07 15:44:58 -03:00
Darius
3adcab1756 Display job slots out of total during late-join
Changes late join text from "Job (current)" to "Job (current/limit)" to prevent confusion. Infinite-slot jobs display an infinity symbol.
2023-01-04 19:15:09 -05:00
Lin
1401959cc9 Merge pull request #15911 from Hatterhat/prescription
prescription kits, aka the eyewear accessibility update
2023-01-01 22:52:21 -07:00
Hatterhat
6ce2005f9f fixes mechs exploding on sale too btw 2022-12-29 20:59:54 -06:00
Hatterhat
771070a606 why put the big X on run and not annotations 2022-12-29 20:35:38 -06:00
Hatterhat
8ca98934af lmao shit forgot to remove this too 2022-12-29 20:20:50 -06:00
Hatterhat
34eaf93a01 sorters! one-way setting! brazen code borrowing! 2022-12-29 20:18:34 -06:00
Hatterhat
062cbaed29 wow does that actually compile 2022-12-29 19:34:14 -06:00
Lin
746885b2ae Merge pull request #15901 from Hatterhat/recoil-pref
[untested] makes recoil screenshake pref save actually
2022-12-27 17:37:43 -07:00
Lin
66c2dd49e3 Merge pull request #15910 from LeDrascol/port-bluespace-light-replacer
[PORT] Bluespace Light Replacer
2022-12-27 17:34:21 -07:00
Darius
b8079b108f Move furnace init variable
Moves the init_process variable above the var defines to drastically improve style.

Requested by SandPoot.
2022-12-26 22:35:22 -05:00
Hatterhat
50a0991ce3 minor point dupe kill 2022-12-26 12:00:54 -06:00
Hatterhat
3324f3a46c whitespace fix 2022-12-26 09:26:04 -06:00
Hatterhat
d9b431ab91 disposable 2022-12-26 03:53:56 -06:00
Hatterhat
4fa0527ba7 forgot to add The Lore so no lore 2022-12-26 03:46:48 -06:00
Hatterhat
ab827ff8dc accessibility or some shit ig 2022-12-26 03:45:26 -06:00
Hatterhat
05178784d4 sanitize 2022-12-26 01:38:44 -06:00
SandPoot
5ee1e5414f Merge pull request #15895 from Linzolle/claw
fixes species not using the claw animation for unarmed attacks
2022-12-24 18:42:09 -03:00
Darius
d3e018720c Port the Bluespace Light Replacer
- Ports the Bluespace Light Replacer from TG
-- Added to Applied Bluespace Research instead of Advanced Sanitation Technology
- Makes the basic Light Replacer a default tech node
2022-12-24 15:57:11 -05:00
Hatterhat
c54ed0ceda overstepped the scope tbh 2022-12-24 01:44:03 -06:00
Darius
dae235f97c Selective mineral machine init_process
Requested by SandPoot. Disables init_process for mineral (mining) machines, and enables it on a case-by-case basis.

Downstream mineral machines must be updated with this change.
2022-12-23 16:16:57 -05:00
Hatterhat
3ea2c35832 mismatch 2022-12-23 02:25:26 -06:00
Hatterhat
55826b9eb8 oops 2022-12-20 20:02:28 -06:00
Jerry Wester
f083852b6f all modules available from mechfab 2022-12-20 02:03:57 -07:00
Jerry Wester
d3c72669d9 clean up & remove longfall boots 2022-12-20 02:03:45 -07:00
Jerry Wester
437c1145e9 anthro sprites, taken from skyrat 2022-12-17 18:08:16 -07:00
Jerry Wester
13f8559190 add springlock module 2022-12-17 16:54:41 -07:00
Jerry Wester
c32cac89d6 fix jetpack placement on techweb 2022-12-17 16:54:35 -07:00
Jerry Wester
552926aa2c fix being able to use modules incapacitated 2022-12-17 16:54:28 -07:00
Jerry Wester
642d24e8e1 tether module 2022-12-17 16:54:20 -07:00
Jerry Wester
483fe09260 add jetpacks to techweb 2022-12-17 16:54:12 -07:00
Darius
bcae0e66ff Fix init_process not preventing processing
Prevents machines from running faster when set to both not init_process and not speed_process.

Changes mineral machine to init_process to fix potential issues caused by this.
2022-12-16 16:25:45 -05:00
Jerry Wester
2bf1abf4fc clothing flag changes 2022-12-14 23:37:21 -07:00
Jerry Wester
b7616a84c6 fix magboot module 2022-12-14 23:37:12 -07:00
Jerry Wester
861575a75f fix rad protect module again 2022-12-14 23:37:01 -07:00
Jerry Wester
b52e7a5657 ion jetpack module 2022-12-14 23:36:47 -07:00
Jerry Wester
adbbb12701 add unregister signal for defib 2022-12-14 23:36:31 -07:00
Lin
7d0c3df2ad Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo
dullahans 2: electric boogaloo
2022-12-14 19:07:59 -07:00
Jerry Wester
32a5d02434 Merge branch 'master' into modsuits 2022-12-13 19:18:24 -07:00
Jerry Wester
ec78e51760 remove piercing injector, doesn't work properly 2022-12-13 19:15:19 -07:00
Jerry Wester
94bfa88ed9 add more platings 2022-12-13 19:14:43 -07:00
Lin
2eee8e4339 Merge pull request #15888 from DeltaFire15/revenge-of-the-blacklist
Roundstart species with a quirk blacklist balance points
2022-12-12 19:13:32 -07:00
Lin
f758a55da3 Merge pull request #15885 from BlueWildrose/pins
Pins, New Loadout Category, CTRLclick for accessory above suit
2022-12-12 19:12:53 -07:00
Lin
7205781c47 Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song
Solves some harddels
2022-12-12 19:11:49 -07:00
Lin
a0cbb52479 slash -> claw 2022-12-12 19:10:50 -07:00
Lin
7411453408 Merge pull request #15887 from Putnam3145/fix-qcd
Make QCD matter not react infinitely, thus generating 200,000 science per second
2022-12-12 19:06:10 -07:00