5640 Commits

Author SHA1 Message Date
Dahlular 07cc6ade7a Merge pull request #1761 from WolvesAndOwls/master
Removes beurocratic error I HATE THE WORD ITS TOO HARD TO SPELL
2024-02-10 15:25:56 -07:00
WolvesAndOwls 376d487e6f Merge branch 'quotefox:master' into master 2024-02-10 16:13:25 -06:00
WolvesAndOwls d889b2be5b Removes bureaucratic_error event 2024-02-10 16:10:58 -06:00
Dahlular 88a433168b Merge pull request #1759 from TotallyNotADog/fixDecayDisk
fixes decay disk upgrade check
2024-01-15 19:21:44 -07:00
Dahlular b802c07b99 Merge pull request #1760 from TotallyNotADog/patch-5
fix gendered language in chemtongue implant
2024-01-15 19:21:07 -07:00
TotallyNotADog 70448c3fd9 fix gendered language in chemtongue implant 2023-07-21 22:50:51 -05:00
TotallyNotADog acccca9d71 fixes decay disk upgrade check 2023-07-21 22:43:14 -05:00
Dahlular 473431baa0 Merge pull request #1756 from TheWolfStudios/patch-4
Fixed spelling mistake that broke LPL trait
2023-02-14 14:23:30 -07:00
The Wolf Studios cc5667c3ac Fixed spelling mistake that broke LPL trait 2023-02-14 15:21:40 -06:00
Dahlular aecd835e86 Merge pull request #1753 from TheWolfStudios/patch-1
V-day Chocco Gun
2023-02-14 00:48:55 -07:00
Dahlular 464289241c Merge pull request #1752 from TheWolfStudios/WOLF_Lavalandian_Trait
Wolf's Low Pressure Lungs Trait
2023-02-14 00:46:59 -07:00
Dahlular 02014986e9 Merge pull request #1755 from ToonClyde/pinata
Pinata markings/snout
2023-02-14 00:44:16 -07:00
ToonClyde 304d0e52d4 Pinata markings 2023-02-13 21:50:43 -07:00
The Wolf Studios 8dd125b882 adds icons for chocco gun 2023-02-13 20:06:27 -06:00
The Wolf Studios 0d4a7712a1 adds chocco gun recipe 2023-02-13 20:05:26 -06:00
The Wolf Studios ddfe378bd3 Adds Choccogun to snacks. 2023-02-13 20:00:40 -06:00
The Wolf Studios 324f039fdb Reminded about remove() 2023-02-13 19:24:52 -06:00
Dahlular d0d13d89c9 No Valentines Day Noncon Shit 2023-02-12 17:21:21 -07:00
The Wolf Studios 0cb6e85347 Update good.dm 2023-02-12 15:42:06 -06:00
The Wolf Studios 7d4a1fa565 Update traits.dm 2023-02-12 14:42:43 -06:00
The Wolf Studios a81cc09a7c Update good.dm 2023-02-12 14:42:04 -06:00
The Wolf Studios ba7d000b7c Update lungs.dm 2023-02-12 14:40:06 -06:00
Dahlular 55b71b3a73 fixes name 2023-02-12 12:18:40 -07:00
The Wolf Studios 5b2e63cbf3 Update lungs.dm 2023-02-12 13:07:19 -06:00
The Wolf Studios e6ce470fbd Update good.dm 2023-02-12 13:06:40 -06:00
The Wolf Studios a09a631392 Update traits.dm 2023-02-12 13:05:14 -06:00
The Wolf Studios 361d01efbd Adds main Lavalandian trait 2023-02-12 04:34:15 -06:00
The Wolf Studios 38453b482e adds Lavalandian to traits.dm 2023-02-12 04:32:21 -06:00
The Wolf Studios b204fdc668 Lavalandian Trait Check Added
Adds a simple trait check for the Lavalandian trait.
2023-02-12 04:26:58 -06:00
Dahlular 61dbb6242c Merge pull request #1750 from LowFP/MapFix_Mailroom
Fix Cargo Postal Office Shutters
2023-02-08 22:47:14 -07:00
Dahlular 1fbd6699e8 Merge pull request #1751 from LowFP/pod_hair
Adds new pod people hair styles!
2023-02-08 22:45:43 -07:00
LFP bf47633409 Adds new pod people hair styles. Looks decent on humans too. 2023-02-05 17:41:39 -06:00
Dahlular c26d556cc1 Merge pull request #1749 from LowFP/Package_Icons
Updates the icons for the delivery packages.
2023-01-29 16:59:57 -07:00
Dahlular 76c655c5f7 Merge pull request #1748 from Kabramen/species
Pod person species for roundstart
2023-01-29 16:58:38 -07:00
LFP 1a5ceb0b65 Revert "Updates the icons for the delivery packages."
This reverts commit 162730b749.
2023-01-29 11:41:37 -06:00
LFP bdd52f15c6 Updates the shutters in the upstairs Cargo Postal Office to not be the same ID as the one in the Quatermaster office. 2023-01-29 11:35:22 -06:00
LFP 162730b749 Updates the icons for the delivery packages. 2023-01-29 10:50:00 -06:00
Kabramen 2da7b42c82 Pod person for roundstart 2023-01-10 23:54:06 -03:00
Dahlular 175daeb028 Merge pull request #1746 from ProbablyCarl/HECC_YOU_DISKIE
AAAAAAAAAAAAAAAAA
2022-12-31 21:28:54 -07:00
ProbablyCarl 271d749c5c AAAAAAAAAAAAAAAAA 2022-12-31 23:27:18 -05:00
Dahlular 893e67da1a Merge pull request #1745 from ProbablyCarl/HECC_YOU_DISKIE
DISKIE PLEASE SHUT UP
2022-12-31 20:11:54 -07:00
ProbablyCarl 9391dd4079 DISKIE PLEASE SHUT UP 2022-12-31 07:41:28 -05:00
Dahlular 31729d85cb Merge pull request #1744 from Dahlular/archie-is-a-pain-in-my-ass
removes an unfunny joke
2022-12-25 12:43:43 -07:00
Dahlular 0cf7c6a3fb removes an unfunny joke 2022-12-25 12:42:47 -07:00
Dahlular 5ddff2a99d Merge pull request #1740 from Dahlular/reeeee
Fixes missing virologist spawns
2022-11-21 06:04:19 -07:00
Dahlular 4b3ad0b63a adds a virologist spawn 2022-11-21 06:03:26 -07:00
Dahlular 8b48b42888 Merge pull request #1739 from Chemlight/BarDrobe
Bartender/BarDrobe changes
2022-11-20 11:08:00 -07:00
Chemlight 5b5dbbe824 Oopsie 2022-11-20 10:05:22 -08:00
Chemlight 05954a6b76 Bartender/BarDrobe changes 2022-11-19 19:21:04 -08:00
Dahlular 02c6b6a174 Merge pull request #1738 from Oposshim/new-donk-fix
extended donks (spritefix)
2022-11-19 03:39:43 -07:00