cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-21 23:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,088 Commits 9 Branches 0 Tags
fc8954ddc4e22f7ac4d10a48d66bfaa14aa9aa9e
Commit Graph

12890 Commits

Author SHA1 Message Date
Nadyr
fc8954ddc4 Merge pull request #2820 from lbnesquik/Kot-taur-clothessss 
Adds plague doctor outfits to drake and lizard taurs.
 2021-08-17 19:35:43 -04:00
Nadyr
1f696ab504 Merge pull request #2818 from Verkister/patch-29 
Refluffs phoron oties for chomp lore
 2021-08-17 19:03:05 -04:00
lbnesquik
3a611509cf Adds plague doctor outfits to drake and lizard taurs. Probs more to come as i get off my ass. 2021-08-17 23:34:23 +02:00
Verkister
a6d39fca28 Refluffs phoron oties for chomp lore 
Instead of adapting to Virgo-3B climate, they just ate a bunch of phoron.
 2021-08-17 13:13:09 +03:00
Raeschen
b76695e685 a long winded learning experience 2021-08-17 08:22:27 +02:00
Raeschen
6deb4e071c Revert "Merge branch 'master' into prbt" 
This reverts commit 6240ccc5fe, reversing
changes made to 2055234acf.
 2021-08-17 08:13:00 +02:00
Raeschen
d0b32346a6 Revert "Revert "Merge branch 'master' into prbt"" 
This reverts commit c7f19ecde1.
 2021-08-17 08:12:56 +02:00
Raeschen
cb879c31aa Revert "Fix conflict with master" 
This reverts commit 42eba2a9dc.
 2021-08-17 08:12:43 +02:00
Raeschen
42eba2a9dc Fix conflict with master 2021-08-17 08:01:06 +02:00
Raeschen
c7f19ecde1 Revert "Merge branch 'master' into prbt" 
This reverts commit 6240ccc5fe, reversing
changes made to 2055234acf.
 2021-08-17 07:54:00 +02:00
Raeschen
6240ccc5fe Merge branch 'master' into prbt 2021-08-17 07:50:06 +02:00
Raeschen
2055234acf Fix missing comments and commas 2021-08-17 07:47:55 +02:00
Verkister
ba35cd5002 Adds squeaky toy noise as audible emote. 
*squeaky

Mirrorbot did another fucky wucky >:v
 2021-08-16 13:09:04 +03:00
Raeschen
b6ac8b4939 Adds *prbt 
Very important sound.
 2021-08-16 11:05:09 +02:00
Nadyr
0cac8473de Merge pull request #2791 from CHOMPStationBot/upstream-merge-11398 
[MIRROR] Przy creations port from Chompers
 2021-08-15 00:35:23 -04:00
Nadyr
b420edf362 powder that makes you say yes 2021-08-15 00:01:29 -04:00
Nadyr
9b81b377c5 powder that makes you say yes 2021-08-14 22:14:08 -04:00
Nadyr
13956aa710 Merge pull request #2796 from Cyrelius/Cyrelius-patch-3 
Update sprite_accessories_taur_ch.dm
 2021-08-14 05:19:18 -04:00
Cyrelius
1ff2a500ba Update sprite_accessories_taur_ch.dm 
Added flavor text to naga alt tail that should have been there to begin with.
 2021-08-14 00:38:47 -07:00
Nadyr
7180f3d4c9 Merge pull request #2795 from CHOMPStationBot/upstream-merge-11383 
[MIRROR] Add default zorren tail to character setup menu
 2021-08-14 01:40:11 -04:00
Nadyr
e259e77ebe Merge pull request #2777 from User-U-U/medinerdsurgerytools 
Gives Medihound borg module surgery Tools
 2021-08-14 01:39:40 -04:00
Nadyr
72598b3bfe powder that makes you say yes 2021-08-13 23:53:46 -04:00
Chompstation Bot
17fbf219fc Add default zorren tail to character setup menu 2021-08-13 15:56:39 +00:00
Chompstation Bot
b3d81048cb Przy creations port from Chompers 2021-08-13 15:41:03 +00:00
Razgriz
d3cd7fd03b Removes broken YW bots. 
Borg code would need to be overhauled again.
 2021-08-12 20:48:33 -07:00
Tename
b57805eaf5 Done 2021-08-10 23:44:06 -07:00
Nadyr
0b635bc357 Merge pull request #2764 from CHOMPStationBot/upstream-merge-11367 
[MIRROR] Fimxes shadekin eyecolors displaying wonkily
 2021-08-09 18:47:56 -04:00
Aronai Sieyes
008c1ba080 Merge pull request #11367 from Heroman3003/eue-fix 
Fimxes shadekin eyecolors displaying wonkily
 2021-08-09 03:29:02 +00:00
Aronai Sieyes
9ea77444f9 Merge pull request #11366 from Verkister/patch-78 
Finally fixes "It's contains glorping slush"
 2021-08-08 20:11:59 +00:00
Nadyr
949daef5b1 Merge pull request #2748 from CHOMPStation2/Razgriz1032-patch-9 
Protean now gets default survival box
 2021-08-08 06:38:36 -04:00
Razgriz
768f6e4f6e Merge pull request #2737 from CHOMPStationBot/upstream-merge-11338 
[MIRROR] New Floor Tanks
 2021-08-08 01:06:27 -07:00
Aronai Sieyes
5183b0fa73 Merge pull request #11364 from VOREStation/Fixes/11352 
Fixes #11352
 2021-08-08 01:39:43 +00:00
Razgriz
391853b436 Merge pull request #2742 from CHOMPStationBot/upstream-merge-11343 
[MIRROR] Port Eris maint drone as option
 2021-08-07 15:13:28 -07:00
Razgriz
18481e157f Protean now gets default survival box 2021-08-07 14:25:25 -07:00
Chompstation Bot
6731e90dae Port Eris maint drone as option 2021-08-06 22:15:57 +00:00
Chompstation Bot
b2b980c371 New Floor Tanks 2021-08-06 15:38:14 +00:00
Novacat
d072b0923b Merge pull request #11349 from VOREStation/Arokha/barerrerr 
Make a borer subtype for adminbuse
 2021-08-06 15:01:22 +00:00
Aronai Sieyes
dfd88b4ba7 Merge pull request #11326 from Verkister/hudbutts 
Fixes the small hud buttons not getting hud colors
 2021-08-02 13:40:43 +00:00
Nadyr
f0d5ea81a4 Merge pull request #2710 from CHOMPStationBot/upstream-merge-10773 
[MIRROR] [MIRROR] Adds optional area-based definition for outdoors-ness
 2021-08-01 17:47:09 -04:00
Nadyr
9a38017a08 powder that makes you say yes 2021-08-01 15:19:20 -04:00
Chompstation Bot
21b6022a3a [MIRROR] Adds optional area-based definition for outdoors-ness 2021-08-01 15:41:46 +00:00
Chompstation Bot
e0900e747c Reworks Shadekin eyecolors (again) 2021-08-01 14:48:52 +00:00
Nadyr
1a38674550 Merge pull request #2696 from CHOMPStationBot/upstream-merge-11311 
[MIRROR] Vore Panel and Character Setup HUD buttons
 2021-08-01 00:06:19 -04:00
Nadyr
4e1149b326 Merge pull request #2700 from CHOMPStationBot/upstream-merge-11313 
[MIRROR] Fix fake fox type
 2021-07-31 23:53:00 -04:00
Nadyr
8a720df372 powder that makes you say yes 2021-07-31 23:51:10 -04:00
Nadyr
4b5f5a8367 powder that makes you say yes 2021-07-31 23:47:32 -04:00
Aronai Sieyes
bb0a118a96 Merge pull request #11313 from VOREStation/Arokha/faketype 
Fix fake fox type
 2021-08-01 03:27:05 +00:00
Chompstation Bot
f0e0a6424b Vore Panel and Character Setup HUD buttons 2021-08-01 03:25:38 +00:00
Razgriz
4e847ee9d8 Merge pull request #2691 from Darlantanis/ballistics_revert 
Revert ballistics overhaul
 2021-07-31 18:20:48 -07:00
Nadyr
1aab6fcc45 Merge pull request #2693 from CHOMPStationBot/upstream-merge-11309 
[MIRROR] Fixes eggless nurse/spider queens being able to lay eggs when player-controlled
 2021-07-31 20:16:33 -04:00