Commit Graph

  • 07cc6ade7a Merge pull request #1761 from WolvesAndOwls/master master Dahlular 2024-02-10 15:25:56 -07:00
  • 376d487e6f Merge branch 'quotefox:master' into master WolvesAndOwls 2024-02-10 16:13:25 -06:00
  • d889b2be5b Removes bureaucratic_error event WolvesAndOwls 2024-02-10 16:10:58 -06:00
  • 88a433168b Merge pull request #1759 from TotallyNotADog/fixDecayDisk Dahlular 2024-01-15 19:21:44 -07:00
  • b802c07b99 Merge pull request #1760 from TotallyNotADog/patch-5 Dahlular 2024-01-15 19:21:07 -07:00
  • 70448c3fd9 fix gendered language in chemtongue implant TotallyNotADog 2023-07-21 22:50:51 -05:00
  • acccca9d71 fixes decay disk upgrade check TotallyNotADog 2023-07-21 22:43:14 -05:00
  • 473431baa0 Merge pull request #1756 from TheWolfStudios/patch-4 Dahlular 2023-02-14 14:23:30 -07:00
  • cc5667c3ac Fixed spelling mistake that broke LPL trait The Wolf Studios 2023-02-14 15:21:40 -06:00
  • aecd835e86 Merge pull request #1753 from TheWolfStudios/patch-1 Dahlular 2023-02-14 00:48:55 -07:00
  • 464289241c Merge pull request #1752 from TheWolfStudios/WOLF_Lavalandian_Trait Dahlular 2023-02-14 00:46:59 -07:00
  • 02014986e9 Merge pull request #1755 from ToonClyde/pinata Dahlular 2023-02-14 00:44:16 -07:00
  • 304d0e52d4 Pinata markings ToonClyde 2023-02-13 21:50:43 -07:00
  • 8dd125b882 adds icons for chocco gun The Wolf Studios 2023-02-13 20:06:27 -06:00
  • 0d4a7712a1 adds chocco gun recipe The Wolf Studios 2023-02-13 20:05:26 -06:00
  • ddfe378bd3 Adds Choccogun to snacks. The Wolf Studios 2023-02-13 20:00:40 -06:00
  • 324f039fdb Reminded about remove() The Wolf Studios 2023-02-13 19:24:52 -06:00
  • d0d13d89c9 No Valentines Day Noncon Shit Dahlular 2023-02-12 17:21:21 -07:00
  • 0cb6e85347 Update good.dm The Wolf Studios 2023-02-12 15:42:06 -06:00
  • 7d4a1fa565 Update traits.dm The Wolf Studios 2023-02-12 14:42:43 -06:00
  • a81cc09a7c Update good.dm The Wolf Studios 2023-02-12 14:42:04 -06:00
  • ba7d000b7c Update lungs.dm The Wolf Studios 2023-02-12 14:40:06 -06:00
  • 55b71b3a73 fixes name Dahlular 2023-02-12 12:18:40 -07:00
  • 5b2e63cbf3 Update lungs.dm The Wolf Studios 2023-02-12 13:07:19 -06:00
  • e6ce470fbd Update good.dm The Wolf Studios 2023-02-12 13:06:40 -06:00
  • a09a631392 Update traits.dm The Wolf Studios 2023-02-12 13:05:14 -06:00
  • 361d01efbd Adds main Lavalandian trait The Wolf Studios 2023-02-12 04:34:15 -06:00
  • 38453b482e adds Lavalandian to traits.dm The Wolf Studios 2023-02-12 04:32:21 -06:00
  • b204fdc668 Lavalandian Trait Check Added The Wolf Studios 2023-02-12 04:26:58 -06:00
  • 61dbb6242c Merge pull request #1750 from LowFP/MapFix_Mailroom Dahlular 2023-02-08 22:47:14 -07:00
  • 1fbd6699e8 Merge pull request #1751 from LowFP/pod_hair Dahlular 2023-02-08 22:45:43 -07:00
  • bf47633409 Adds new pod people hair styles. Looks decent on humans too. LFP 2023-02-05 17:41:39 -06:00
  • c26d556cc1 Merge pull request #1749 from LowFP/Package_Icons Dahlular 2023-01-29 16:59:57 -07:00
  • 76c655c5f7 Merge pull request #1748 from Kabramen/species Dahlular 2023-01-29 16:58:38 -07:00
  • 1a5ceb0b65 Revert "Updates the icons for the delivery packages." LFP 2023-01-29 11:41:37 -06:00
  • bdd52f15c6 Updates the shutters in the upstairs Cargo Postal Office to not be the same ID as the one in the Quatermaster office. LFP 2023-01-29 11:35:22 -06:00
  • 162730b749 Updates the icons for the delivery packages. LFP 2023-01-29 10:50:00 -06:00
  • 2da7b42c82 Pod person for roundstart Kabramen 2023-01-10 23:54:06 -03:00
  • 88bec828a2 Bump json5 from 1.0.1 to 1.0.2 in /tgui dependabot/npm_and_yarn/tgui/json5-1.0.2 dependabot[bot] 2023-01-06 23:19:13 +00:00
  • 175daeb028 Merge pull request #1746 from ProbablyCarl/HECC_YOU_DISKIE Dahlular 2022-12-31 21:28:54 -07:00
  • 271d749c5c AAAAAAAAAAAAAAAAA ProbablyCarl 2022-12-31 23:27:18 -05:00
  • 893e67da1a Merge pull request #1745 from ProbablyCarl/HECC_YOU_DISKIE Dahlular 2022-12-31 20:11:54 -07:00
  • 9391dd4079 DISKIE PLEASE SHUT UP ProbablyCarl 2022-12-31 07:41:28 -05:00
  • 31729d85cb Merge pull request #1744 from Dahlular/archie-is-a-pain-in-my-ass Dahlular 2022-12-25 12:43:43 -07:00
  • 0cf7c6a3fb removes an unfunny joke Dahlular 2022-12-25 12:42:47 -07:00
  • 71f9ec214a Bump express from 4.17.1 to 4.18.2 in /tgui dependabot/npm_and_yarn/tgui/express-4.18.2 dependabot[bot] 2022-12-15 01:42:30 +00:00
  • ba984c89a4 Bump decode-uri-component from 0.2.0 to 0.2.2 in /tgui dependabot/npm_and_yarn/tgui/decode-uri-component-0.2.2 dependabot[bot] 2022-12-08 15:17:25 +00:00
  • 227a20a0b7 Bump pillow from 9.0.1 to 9.3.0 in /tools/mapmerge2 dependabot/pip/tools/mapmerge2/pillow-9.3.0 dependabot[bot] 2022-11-22 10:30:56 +00:00
  • 5ddff2a99d Merge pull request #1740 from Dahlular/reeeee Dahlular 2022-11-21 06:04:19 -07:00
  • 4b3ad0b63a adds a virologist spawn Dahlular 2022-11-21 06:03:26 -07:00
  • 8b48b42888 Merge pull request #1739 from Chemlight/BarDrobe Dahlular 2022-11-20 11:08:00 -07:00
  • 5b5dbbe824 Oopsie Chemlight 2022-11-20 10:05:22 -08:00
  • 05954a6b76 Bartender/BarDrobe changes Chemlight 2022-11-19 19:21:04 -08:00
  • 02c6b6a174 Merge pull request #1738 from Oposshim/new-donk-fix Dahlular 2022-11-19 03:39:43 -07:00
  • 9ce699ec39 Merge pull request #1737 from SquishyRolls/dookwrong Dahlular 2022-11-19 03:39:07 -07:00
  • 6f72f0f9fa extended donks (spritefix) Oposshim 2022-11-18 17:15:52 -05:00
  • db942f1620 Adds new dukenukem end of round quote SquishyRolls 2022-11-18 20:54:51 +00:00
  • 74338c9b71 If we're going PvE, we need this Dahlular 2022-11-15 02:03:57 -07:00
  • f53014e031 Merge pull request #1735 from TotallyNotADog/stockpartResprite Dahlular 2022-11-14 22:25:21 -07:00
  • faaea649e4 new sprites for stock parts and batteries TotallyNotADog 2022-11-14 23:15:23 -06:00
  • 13303a18c2 Slight Dynamic Rebalance Dahlular 2022-11-14 20:24:08 -07:00
  • bdd6c4e751 okay, let's try this then Dahlular 2022-11-14 19:35:52 -07:00
  • 7928957859 miss me with that Dahlular 2022-11-13 02:04:20 -07:00
  • 8f4386eb88 increases crystal mob size Dahlular 2022-11-12 18:47:13 -07:00
  • 91946ce834 Merge pull request #1734 from DragonTrance/shifteng Dahlular 2022-11-12 18:01:21 -07:00
  • 4539cc51b5 Merge pull request #1733 from DragonTrance/floor-ligjht-thing Dahlular 2022-11-12 18:00:47 -07:00
  • 24374b75c1 Merge pull request #1732 from DragonTrance/tech-disk-renaming Dahlular 2022-11-12 18:00:23 -07:00
  • 308c480023 Merge pull request #1731 from DragonTrance/timer-improvements Dahlular 2022-11-12 17:58:00 -07:00
  • bdf4d72226 of course DragonTrance 2022-11-12 14:26:42 -05:00
  • 7cb0031a36 You can press & hold the keys for pixel shifting now DragonTrance 2022-11-12 14:21:49 -05:00
  • 9d47fadcc4 Floor lights no longer appear over mobs DragonTrance 2022-11-12 14:03:46 -05:00
  • 6038d0a911 Allows Tech/Design/Clone disks to be renamed DragonTrance 2022-11-12 13:39:16 -05:00
  • 5cf5407bb5 re-adding debug panel, adds more junk DragonTrance 2022-11-12 11:00:14 -05:00
  • 3d41e614a8 Revert "port tgstation/tgstation#52409" DragonTrance 2022-11-12 10:29:43 -05:00
  • 453201fe41 Revert "port tgstation/tgstation#52417" DragonTrance 2022-11-12 10:29:40 -05:00
  • 442fd4a0f5 Revert "port tgstation/tgstation#54977" DragonTrance 2022-11-12 10:29:35 -05:00
  • 453be34c05 Revert "port tgstation/tgstation#55140" DragonTrance 2022-11-12 10:29:33 -05:00
  • 292304a68d Revert "fix endlessly-looping timers" DragonTrance 2022-11-12 10:29:29 -05:00
  • c7b547982b Merge pull request #1729 from DragonTrance/gitignore-message Dahlular 2022-11-11 20:58:06 -07:00
  • 78eae647a4 Merge pull request #1727 from DragonTrance/timer-improvements Dahlular 2022-11-11 20:57:26 -07:00
  • 6e657ed766 Merge pull request #1730 from Dahlular/pixelstuff Dahlular 2022-11-11 20:49:49 -07:00
  • a99a02e13e Merge pull request #1728 from DragonTrance/increased-panel-size Dahlular 2022-11-11 20:49:12 -07:00
  • 0af8914b35 Merge pull request #1725 from WolvesAndOwls/master Dahlular 2022-11-11 20:47:39 -07:00
  • 5dff58c8f8 updates ZaoCorp sprites Dahlular 2022-11-11 20:40:50 -07:00
  • 7d98cfd120 Slightly longer animate time Dahlular 2022-11-11 20:30:24 -07:00
  • 7819d5c1b7 Update .gitignore DragonTrance 2022-11-11 11:35:20 -05:00
  • 82a76b9519 increases game panel size DragonTrance 2022-11-11 11:25:05 -05:00
  • 52043dea7e fix endlessly-looping timers DragonTrance 2022-11-11 10:04:01 -05:00
  • 55aecea4a6 port tgstation/tgstation#55140 DragonTrance 2022-11-11 10:00:39 -05:00
  • bb9bacf7dc port tgstation/tgstation#54977 DragonTrance 2022-11-11 09:43:15 -05:00
  • 67e365cd1f port tgstation/tgstation#52417 DragonTrance 2022-11-11 09:30:41 -05:00
  • bfdebd524d port tgstation/tgstation#52409 DragonTrance 2022-11-11 09:04:24 -05:00
  • 9206d2f221 animated sprite, thanks quote <3 Dahlular 2022-11-11 03:16:11 -07:00
  • 2851fb84de Merge pull request #1726 from LowFP/stone_tiles Dahlular 2022-11-10 13:00:41 -07:00
  • b8c93bedd0 New stone tiles LFP 2022-11-10 09:33:24 -06:00
  • 844e68c94e indecyte + placeholder sprite Dahlular 2022-11-10 01:15:19 -07:00
  • 8c279a684e Central Command Inspector has been disabled, and the map, CentCom.dmm, reflects the change to compile. Samuel Dweller 2022-11-10 01:02:14 -06:00
  • e3f28b5cd6 Merge pull request #1724 from WolvesAndOwls/master Dahlular 2022-11-09 21:50:16 -07:00
  • 439d1c304d Plastic forks, knives, and spoons no longer are conductive. Samuel Dweller 2022-11-09 19:49:32 -06:00
  • c353e8c436 plastic utensils are no longer explosive in the microwave Samuel Dweller 2022-11-09 13:42:39 -06:00