Commit Graph

20737 Commits

Author SHA1 Message Date
Lex
116dddc134 added datum and verbs for chane ai laws 2023-02-09 10:32:53 +03:00
zerothebigboy
d93dcf5b76 sickkicks 2023-02-01 08:25:30 -05:00
silicons
469ac02274 Merge pull request #15950 from SandPoot/trigger-events-tgui
Event menu rewrite
2023-01-29 13:46:39 -08:00
silicons
fec5653da6 Merge pull request #15949 from SandPoot/fix-solar-runtimes
Turns out the glass type giving you better stats didn't work
2023-01-29 13:46:21 -08:00
silicons
eda34c0dc2 Merge pull request #15946 from LetterN/mentor-sql-fix
update mentor admin log sql query
2023-01-29 13:46:12 -08:00
silicons
5e30dad781 Merge pull request #15942 from LeDrascol/protolathe-ejection-improvements
Protolathe material ejection improvements
2023-01-29 13:46:01 -08:00
silicons
e7a9edbc6f Merge pull request #15953 from SandPoot/fix-pen-tablet
Fixes the tablet pen buttons
2023-01-29 13:42:29 -08:00
SandPoot
32a36a1bfa put back 2023-01-27 23:03:47 -03:00
SandPoot
54641ce201 send 2023-01-23 20:44:28 -03:00
silicons
2d5e163916 Merge pull request #15947 from SandPoot/bitfield-updates
Updates bitfields, admin side
2023-01-23 13:02:28 -08:00
SandPoot
9edcd1b353 fix it 2023-01-23 16:56:37 -03:00
SandPoot
854a1c1b5c modified content 2023-01-22 14:09:10 -03:00
LetterN
d240eb5377 update mentor admin log sql query 2023-01-22 11:40:21 +08: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
Darius
4fc30ce8ae Protolathe material ejection improvements
Updates to the protolathe:
- Added eject buttons for 10x, 20x, and 50x
- Renamed "Eject" to "1x"
- Renamed "All" to "Max Stack"
2023-01-16 00:18:35 -05: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
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
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
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
cf51a4dce9 dusting off 2023-01-10 18:32:49 -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
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
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
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