shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,308 Commits 5 Branches 0 Tags
35d01aa0f44aa10e7fdb274891fed9c2ddf8e441
Commit Graph

30488 Commits

Author SHA1 Message Date
Timothy Teakettle
35d01aa0f4 Merge pull request #15918 from LeDrascol/port-heirloom-update 
[PORT] Non-global heirloom definitions
 2023-01-12 23:39:41 +00:00
Timothy Teakettle
6f1e2120f1 Merge pull request #15935 from LeDrascol/quirk-remove-colorist 
Convert Colorist from quirk to loadout item
 2023-01-12 23:32:03 +00:00
Hatterhat
e9ff5e00e0 works on my machine 2023-01-11 20:49:26 -06:00
Hatterhat
e2b476ffa8 guess i forgot this 2023-01-11 18:33:34 -06:00
Darius
aa1b82f0b1 Convert Colorist from quirk to loadout item 
Removes the Colorist quirk, and adds Hair Dye Spray to the loadout under backpack items.
 2023-01-11 14:23:14 -05:00
Timothy Teakettle
c8fc27fc9c Merge pull request #15930 from SandPoot/reskinning 
Update to reskinning
 2023-01-11 01:00:35 +00:00
SandPoot
3b8d102fac puts pda in the system to remove shitcode 2023-01-10 20:02:12 -03:00
SandPoot
cf51a4dce9 dusting off 2023-01-10 18:32:49 -03:00
SandPoot
6bbd44afe7 element time 2023-01-10 18:08:17 -03:00
SandPoot
f066a260f2 previous could break 2023-01-09 08:05:48 -03:00
SandPoot
c94aa43432 quick fix and little extra usage! 2023-01-08 22:02:30 -03:00
SandPoot
f2a49bc319 first commit with everything 2023-01-08 21:36:57 -03:00
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
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
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
Darius
d90fa375e1 Move heirloom lists to relevant files 
Port of the current TG heirloom system.

Heirlooms are now stored in job_types and species_types instead of a global list. Items used as heirlooms match their modern TG counterparts when possible.

Also fixes the ancient first aid kit, which is used for a heirloom.
 2023-01-04 13:57:54 -05: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
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
silicons
0712bb4c79 Merge pull request #15897 from LeDrascol/auto-lumi-eyes 
Automatically implant High Luminosity Eyes
 2022-12-21 12:38:13 -08: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