Commit Graph

30501 Commits

Author SHA1 Message Date
zerothebigboy 091d9ec00f good 2023-01-30 00:01:22 -05:00
silicons 2d5e163916 Merge pull request #15947 from SandPoot/bitfield-updates
Updates bitfields, admin side
2023-01-23 13:02:28 -08:00
SandPoot 854a1c1b5c modified content 2023-01-22 14:09:10 -03:00
Lin 6dd017fc21 Merge pull request #15933 from LeDrascol/polychromatic-cowboy-hat
Adds the Polychromatic Cowboy Hat
2023-01-18 18:11:21 -07:00
Lin bd6a170299 Merge pull request #15943 from SandPoot/silicon-stuff
Update some silicon stuff
2023-01-18 17:52:06 -07:00
SandPoot 0ebcf0b72f stuff 2023-01-16 18:16:32 -03:00
Lin c73df1efb9 Merge pull request #15937 from LeDrascol/ptech-all-carts
Add all missing job cartridges to PTech
2023-01-15 15:34:28 -07:00
Lin a00bb99936 Merge pull request #15934 from LeDrascol/update-lumi-eyes
Minor improvements to High Luminosity Eyes
2023-01-15 15:34:21 -07:00
Darius 791f89a179 Prevent nutriment pump with no process food trait (#15941)
Prevents the nutriment pump implant from functioning on mobs with TRAIT_NO_PROCESS_FOOD., as this behavior appears to be unintended.
2023-01-14 04:51:42 +01:00
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
Darius b25248d7ae Add all job cartridges to PTech
Adds all remaining unavailable job cartridges to the Head of Personnel's PTech vending machine. Carts are sorted by standard job, virus, then command.
2023-01-12 00:13:42 -05: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
Darius 045eb4a8c9 Add quirk removal code for High Luminosity Eyes
Restores the character's default eyes when removing the High Luminosity Eyes quirk. Ensures that the character has eyes, and that those eyes are luminescent.
2023-01-11 13:41:21 -05:00
Darius d6ddb68c6f Minor updates to High Luminosity Eyes flavor text
This commit does the following:
- Fixes minor typos
- Increases the amount of information presented
- Adjusts flavor text to be more specific
2023-01-11 13:39:00 -05:00
Darius a8b7cd9c4a Adds the Polychromatic Cowboy Hat
Adds a new polychromatic variant of the white cowboy hat.
2023-01-10 20:40:01 -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