Commit Graph

47293 Commits

Author SHA1 Message Date
Jerry Wester
ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
Lin
efb2d19cb9 Merge pull request #15921 from LeDrascol/port-furrypride-graffiti
[PORT] Furry Pride graffiti
2023-01-07 16:38:34 -07: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
silicons
a4de5f6e3c Merge pull request #15924 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/json5-1.0.2
Bump json5 from 1.0.1 to 1.0.2 in /tgui
2023-01-07 13:53:18 -08:00
silicons
a12efc1790 Merge pull request #15905 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/nanoid-3.3.4
Bump nanoid from 3.1.25 to 3.3.4 in /tgui
2023-01-07 13:48:27 -08:00
silicons
f6bed321cb Merge pull request #15904 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/minimist-1.2.7
Bump minimist from 1.2.5 to 1.2.7 in /tgui
2023-01-07 13:48:22 -08:00
silicons
87d6d97160 Merge pull request #15903 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/minimatch-3.1.2
Bump minimatch from 3.0.4 to 3.1.2 in /tgui
2023-01-07 13:48:16 -08:00
silicons
973bb93755 Merge pull request #15902 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/terser-5.16.1
Bump terser from 5.7.1 to 5.16.1 in /tgui
2023-01-07 13:47:53 -08:00
dependabot[bot]
78bb808a7a Bump json5 from 1.0.1 to 1.0.2 in /tgui
Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-07 20:27:40 +00:00
SandPoot
4264fc0231 Merge pull request #15923 from SandPoot/pls-signals
Quick fix to Putnam's beauty revival
2023-01-07 16:43:09 -03:00
SandPoot
183eaf8a68 come on, the signal positions! 2023-01-07 16:34:23 -03:00
SandPoot
c3d6816780 Merge pull request #15577 from Putnam3145/bring-beauty-back
Adds beauty back
2023-01-07 15:58:46 -03:00
SandPoot
70b7d35da9 Merge pull request #15899 from LeDrascol/port-alien-tools-resprite
[PORT] Abductor surgical tools resprite
2023-01-07 15:50:34 -03: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
SandPoot
4799d24d67 Merge pull request #15919 from LeDrascol/latejoin-slot-totals
Display job slots out of total during late-join
2023-01-07 15:40:52 -03:00
Darius
4bea655c8b Port Furry Pride graffiti
Ports the large "Furry Pride" graffiti from TG.
2023-01-05 17:38:02 -05:00
Lin
b5d794a6b3 Merge pull request #15916 from LeDrascol/mop-sprite-fix
Fix Advanced Mop inhands sprite
2023-01-04 21:50:54 -07: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
37b9ba48e3 Merge pull request #15917 from LeDrascol/bslr-effect-reduction
Play BSLR effects only when replacing lights
2023-01-04 13:05:37 -07:00
Darius
e5813bec20 Play BSLR effects only when replacing
Prevents the Bluespace Light Replacer from playing sounds or displaying a beam when the target's light won't be replaced. Based on the BSRPED's behavior.
2023-01-03 14:36:56 -05:00
Darius
7dc500e526 Fix Advanced Mop inhands sprite
Restores the sprite to it's unique advmop variant, and fixes a sprite order issue.
2023-01-03 13:10:48 -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
Lin
40457cbedd Merge pull request #15913 from Hatterhat/patch-4
minor miner point dupe kill
2022-12-27 17:33:27 -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
SandPoot
504bf4fa05 Merge pull request #15906 from Hatterhat/patch-3
fixes bluespace trashbag bounty
2022-12-24 18:32:58 -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
1e1cce6e86 forgor 2022-12-24 11:38:06 -06: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
dependabot[bot]
fa544c56e6 Bump nanoid from 3.1.25 to 3.3.4 in /tgui
Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.25 to 3.3.4.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.1.25...3.3.4)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-21 20:39:37 +00:00
dependabot[bot]
04a70ed90b Bump minimist from 1.2.5 to 1.2.7 in /tgui
Bumps [minimist](https://github.com/minimistjs/minimist) from 1.2.5 to 1.2.7.
- [Release notes](https://github.com/minimistjs/minimist/releases)
- [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/minimistjs/minimist/compare/v1.2.5...v1.2.7)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-21 20:39:17 +00:00
dependabot[bot]
cf9d3b3e2a Bump minimatch from 3.0.4 to 3.1.2 in /tgui
Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2.
- [Release notes](https://github.com/isaacs/minimatch/releases)
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.1.2)

---
updated-dependencies:
- dependency-name: minimatch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-21 20:39:08 +00:00
dependabot[bot]
54629682d0 Bump terser from 5.7.1 to 5.16.1 in /tgui
Bumps [terser](https://github.com/terser/terser) from 5.7.1 to 5.16.1.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/compare/v5.7.1...v5.16.1)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-21 20:39:06 +00:00