Commit Graph

  • e76221f68b yeppers zerothebigboy 2023-01-29 03:57:32 -05:00
  • b8bc94ba13 man zerothebigboy 2023-01-29 00:49:55 -05:00
  • 5ea481089b push SandPoot 2023-01-28 21:36:23 -03:00
  • d53c010745 gone SandPoot 2023-01-28 15:47:18 -03:00
  • bf31279109 prayer SandPoot 2023-01-28 01:28:47 -03:00
  • 44913d5fff Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter SandPoot 2023-01-28 01:20:26 -03:00
  • a56247f828 oops? SandPoot 2023-01-28 01:18:35 -03:00
  • c60f36a42b files SandPoot 2023-01-28 01:10:49 -03:00
  • 32a36a1bfa put back SandPoot 2023-01-27 23:03:47 -03:00
  • 4f034eadc1 yep zerothebigboy 2023-01-26 05:54:51 -05:00
  • 2cfa2c34a6 yep zerothebigboy 2023-01-26 04:11:41 -05:00
  • 54641ce201 send SandPoot 2023-01-23 20:44:28 -03:00
  • 2d5e163916 Merge pull request #15947 from SandPoot/bitfield-updates silicons 2023-01-23 13:02:28 -08:00
  • 9edcd1b353 fix it SandPoot 2023-01-23 16:56:37 -03:00
  • 854a1c1b5c modified content SandPoot 2023-01-22 14:09:10 -03:00
  • d240eb5377 update mentor admin log sql query LetterN 2023-01-22 11:40:21 +08:00
  • 6a4ffcbc29 Fix drinking glass sprite issues Darius 2023-01-19 11:54:49 -05:00
  • 6dd017fc21 Merge pull request #15933 from LeDrascol/polychromatic-cowboy-hat Lin 2023-01-18 18:11:21 -07:00
  • bd6a170299 Merge pull request #15943 from SandPoot/silicon-stuff Lin 2023-01-18 17:52:06 -07:00
  • 36ae492e50 Merge pull request #15915 from LeDrascol/update-drink-sprites Timothy Teakettle 2023-01-16 23:09:43 +00:00
  • 0ebcf0b72f stuff SandPoot 2023-01-16 18:16:32 -03:00
  • 4fc30ce8ae Protolathe material ejection improvements Darius 2023-01-16 00:18:35 -05:00
  • d65679049e Merge pull request #15939 from dapnee/let-that-sink-in Lin 2023-01-15 15:34:35 -07:00
  • c73df1efb9 Merge pull request #15937 from LeDrascol/ptech-all-carts Lin 2023-01-15 15:34:28 -07:00
  • a00bb99936 Merge pull request #15934 from LeDrascol/update-lumi-eyes Lin 2023-01-15 15:34:21 -07:00
  • 71d588f33d Update bounty_console.dm President of Shit PRS 2023-01-14 04:00:48 +00:00
  • 791f89a179 Prevent nutriment pump with no process food trait (#15941) Darius 2023-01-14 03:51:42 +00:00
  • d063144713 Re-Adding Bounty Consoles President of Shit PRS 2023-01-14 02:01:12 +00:00
  • 5251c14f65 Letting that sink in dapnee 2023-01-13 16:59:27 -07:00
  • 35d01aa0f4 Merge pull request #15918 from LeDrascol/port-heirloom-update Timothy Teakettle 2023-01-12 23:39:41 +00:00
  • 6f1e2120f1 Merge pull request #15935 from LeDrascol/quirk-remove-colorist Timothy Teakettle 2023-01-12 23:32:03 +00:00
  • 4e92976e1f Merge pull request #15936 from Hatterhat/glasses-pass2 Timothy Teakettle 2023-01-12 23:31:09 +00:00
  • b25248d7ae Add all job cartridges to PTech Darius 2023-01-12 00:13:42 -05:00
  • e9ff5e00e0 works on my machine Hatterhat 2023-01-11 20:49:26 -06:00
  • e2b476ffa8 guess i forgot this Hatterhat 2023-01-11 18:33:34 -06:00
  • aa1b82f0b1 Convert Colorist from quirk to loadout item Darius 2023-01-11 14:23:14 -05:00
  • 045eb4a8c9 Add quirk removal code for High Luminosity Eyes Darius 2023-01-11 13:41:21 -05:00
  • d6ddb68c6f Minor updates to High Luminosity Eyes flavor text Darius 2023-01-11 13:39:00 -05:00
  • a8b7cd9c4a Adds the Polychromatic Cowboy Hat Darius 2023-01-10 20:40:01 -05:00
  • c8fc27fc9c Merge pull request #15930 from SandPoot/reskinning Timothy Teakettle 2023-01-11 01:00:35 +00:00
  • 3b8d102fac puts pda in the system to remove shitcode SandPoot 2023-01-10 20:02:12 -03:00
  • cf51a4dce9 dusting off SandPoot 2023-01-10 18:32:49 -03:00
  • 6bbd44afe7 element time SandPoot 2023-01-10 18:08:17 -03:00
  • 48e713ff33 Merge pull request #15929 from JerryWester/revert-15894-modsuits silicons 2023-01-09 03:31:09 -08:00
  • f066a260f2 previous could break SandPoot 2023-01-09 08:05:48 -03:00
  • c94aa43432 quick fix and little extra usage! SandPoot 2023-01-08 22:02:30 -03:00
  • f2a49bc319 first commit with everything SandPoot 2023-01-08 21:36:57 -03:00
  • ae347f3399 Revert "MODsuits" Jerry Wester 2023-01-08 17:30:26 -07:00
  • efb2d19cb9 Merge pull request #15921 from LeDrascol/port-furrypride-graffiti Lin 2023-01-07 16:38:34 -07:00
  • e292452aae Merge pull request #15908 from Hatterhat/glasses silicons 2023-01-07 14:10:35 -08:00
  • 35497b250f Merge pull request #15914 from Hatterhat/conveyor-sorter silicons 2023-01-07 14:09:55 -08:00
  • 23327fa268 Merge pull request #15894 from JerryWester/modsuits silicons 2023-01-07 14:07:28 -08:00
  • a4de5f6e3c Merge pull request #15924 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/json5-1.0.2 silicons 2023-01-07 13:53:18 -08:00
  • 129a93c330 Bump follow-redirects from 1.13.2 to 1.15.2 in /tgui dependabot[bot] 2023-01-07 21:50:31 +00:00
  • a12efc1790 Merge pull request #15905 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/nanoid-3.3.4 silicons 2023-01-07 13:48:27 -08:00
  • f6bed321cb Merge pull request #15904 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/minimist-1.2.7 silicons 2023-01-07 13:48:22 -08:00
  • 87d6d97160 Merge pull request #15903 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/minimatch-3.1.2 silicons 2023-01-07 13:48:16 -08:00
  • 973bb93755 Merge pull request #15902 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/terser-5.16.1 silicons 2023-01-07 13:47:53 -08:00
  • 78bb808a7a Bump json5 from 1.0.1 to 1.0.2 in /tgui dependabot[bot] 2023-01-07 20:27:40 +00:00
  • 4264fc0231 Merge pull request #15923 from SandPoot/pls-signals SandPoot 2023-01-07 16:43:09 -03:00
  • 183eaf8a68 come on, the signal positions! SandPoot 2023-01-07 16:34:23 -03:00
  • c3d6816780 Merge pull request #15577 from Putnam3145/bring-beauty-back SandPoot 2023-01-07 15:58:46 -03:00
  • 70b7d35da9 Merge pull request #15899 from LeDrascol/port-alien-tools-resprite SandPoot 2023-01-07 15:50:34 -03:00
  • 535c1c623e Merge pull request #15896 from LeDrascol/fix-machine-init-process SandPoot 2023-01-07 15:44:58 -03:00
  • 4799d24d67 Merge pull request #15919 from LeDrascol/latejoin-slot-totals SandPoot 2023-01-07 15:40:52 -03:00
  • 4bea655c8b Port Furry Pride graffiti Darius 2023-01-05 17:38:02 -05:00
  • b5d794a6b3 Merge pull request #15916 from LeDrascol/mop-sprite-fix Lin 2023-01-04 21:50:54 -07:00
  • 3adcab1756 Display job slots out of total during late-join Darius 2023-01-04 19:15:09 -05:00
  • 37b9ba48e3 Merge pull request #15917 from LeDrascol/bslr-effect-reduction Lin 2023-01-04 13:05:37 -07:00
  • d90fa375e1 Move heirloom lists to relevant files Darius 2023-01-04 13:57:54 -05:00
  • e5813bec20 Play BSLR effects only when replacing Darius 2023-01-03 14:36:56 -05:00
  • 7dc500e526 Fix Advanced Mop inhands sprite Darius 2023-01-03 13:10:48 -05:00
  • 1401959cc9 Merge pull request #15911 from Hatterhat/prescription Lin 2023-01-01 22:52:21 -07:00
  • ca3e4f6d14 Update drinks with new TG sprites Darius 2023-01-01 08:48:53 -05:00
  • 6ce2005f9f fixes mechs exploding on sale too btw Hatterhat 2022-12-29 20:59:54 -06:00
  • 771070a606 why put the big X on run and not annotations Hatterhat 2022-12-29 20:35:38 -06:00
  • 8ca98934af lmao shit forgot to remove this too Hatterhat 2022-12-29 20:20:50 -06:00
  • 34eaf93a01 sorters! one-way setting! brazen code borrowing! Hatterhat 2022-12-29 20:18:34 -06:00
  • 062cbaed29 wow does that actually compile Hatterhat 2022-12-29 19:34:14 -06:00
  • 746885b2ae Merge pull request #15901 from Hatterhat/recoil-pref Lin 2022-12-27 17:37:43 -07:00
  • 66c2dd49e3 Merge pull request #15910 from LeDrascol/port-bluespace-light-replacer Lin 2022-12-27 17:34:21 -07:00
  • 40457cbedd Merge pull request #15913 from Hatterhat/patch-4 Lin 2022-12-27 17:33:27 -07:00
  • b8079b108f Move furnace init variable Darius 2022-12-26 22:35:22 -05:00
  • 50a0991ce3 minor point dupe kill Hatterhat 2022-12-26 12:00:54 -06:00
  • 3324f3a46c whitespace fix Hatterhat 2022-12-26 09:26:04 -06:00
  • d9b431ab91 disposable Hatterhat 2022-12-26 03:53:56 -06:00
  • 4fa0527ba7 forgot to add The Lore so no lore Hatterhat 2022-12-26 03:46:48 -06:00
  • ab827ff8dc accessibility or some shit ig Hatterhat 2022-12-26 03:45:26 -06:00
  • 05178784d4 sanitize Hatterhat 2022-12-26 01:38:44 -06:00
  • 5ee1e5414f Merge pull request #15895 from Linzolle/claw SandPoot 2022-12-24 18:42:09 -03:00
  • 504bf4fa05 Merge pull request #15906 from Hatterhat/patch-3 SandPoot 2022-12-24 18:32:58 -03:00
  • d3e018720c Port the Bluespace Light Replacer Darius 2022-12-24 15:57:11 -05:00
  • 1e1cce6e86 forgor Hatterhat 2022-12-24 11:38:06 -06:00
  • c54ed0ceda overstepped the scope tbh Hatterhat 2022-12-24 01:44:03 -06:00
  • dae235f97c Selective mineral machine init_process Darius 2022-12-23 16:16:57 -05:00
  • 3ea2c35832 mismatch Hatterhat 2022-12-23 02:25:26 -06:00
  • fa544c56e6 Bump nanoid from 3.1.25 to 3.3.4 in /tgui dependabot[bot] 2022-12-21 20:39:37 +00:00
  • 04a70ed90b Bump minimist from 1.2.5 to 1.2.7 in /tgui dependabot[bot] 2022-12-21 20:39:17 +00:00
  • cf9d3b3e2a Bump minimatch from 3.0.4 to 3.1.2 in /tgui dependabot[bot] 2022-12-21 20:39:08 +00:00
  • 54629682d0 Bump terser from 5.7.1 to 5.16.1 in /tgui dependabot[bot] 2022-12-21 20:39:06 +00:00