cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,824 Commits 9 Branches 0 Tags
06c26a9ad5a9cd5e48d6a4ea16a80192aa39873e
Commit Graph

361 Commits

Author SHA1 Message Date
Bib Bob
06c26a9ad5 typo 2023-03-17 01:27:16 -05:00
Bib Bob
fbd0ab1aea pizza parlor superposed pod 2023-03-11 15:40:37 -06:00
Nadyr
bde3f21b52 Merge pull request #5872 from Sharkmare/Gargoyle-abstraction 
Gargoyle Custimization round 1
 2023-03-09 20:48:55 -05:00
Nadyr
151fe34ba6 Merge pull request #5860 from Seris02/sockdigi 
digitigrade socks
 2023-03-09 20:36:17 -05:00
Sharkmare
5eec328c8c Recolorable Petrification code 2023-03-08 22:04:47 +01:00
Sharkmare
4a2b06e0cf Gargoyle Custimization round 1 
"statue of name" now allows to change the statue part
"your skin hardens" now allows to change the hardens part
"you  turn to stone" now allows to change the stone part

"your skin softens" modified to "your skin reverts" so we dont need a negative adjective
 2023-03-08 17:38:36 +01:00
Seris02
4d2fd463ae digitigrade socks 2023-03-07 10:08:38 +08:00
Razgriz
2bbc9a7154 Merge pull request #5843 from Rykka-Stormheart/shep-dev-cozy-dozy 
Adds Sleep Music to Surgery/Cryo/Sleeper
 2023-03-05 12:18:04 -07:00
Seris02
73a79c68f7 fix linters 2023-03-06 00:58:14 +08:00
Rykka Stormheart
2982a7ca85 Adds Sleep Music to Surgery/Cryo/Sleeper 
Plays quiet music when you have;
- An anesthetic mask on your face.
- Been put into a cryopod
- Been put into a sleeper

TBD: Maybe make sleeping do it, but iirc even dying does sleep.

There is a pref toggle for these under Preferences: "Sleeping Music"

Example [here](https://streamable.com/pls63y) of surgery being done. Volume is higher than normal, was adjusted down to 40%.
 2023-03-04 15:56:56 -08:00
Razgriz
f7acd0bd6f Merge pull request #5845 from Kazzc/SuperPoseFixes 
Various Survival Pod Fixes
 2023-03-04 16:38:12 -07:00
Razgriz
2afa319f09 Merge pull request #5842 from Rykka-Stormheart/shep-dev-ear-ringing 
Adds Deafened Feedback, enhances looping sounds further
 2023-03-04 16:37:29 -07:00
Razgriz
3f5f46ba0f Merge pull request #5831 from FluffMedic/Mouse 
Mouse Army Works
 2023-03-04 16:32:03 -07:00
Razgriz
e73ae22a39 Merge pull request #5821 from Sharkmare/Talk-voice-Global 
Globalize the Voice list and fetching
 2023-03-04 16:28:52 -07:00
Kassc
828f56e928 Various Survival Pod Fixes 
*Pirate Ship.
-Gun cabinet is now unlocked.
-All rooms can now be bolted.
*Broadcasting Pod.
-Fixed some typos.
-Added an entertainment channel.
-Added extra press gear.
*Hill Outpost
-Gun cabinet is now unlocked.
-Fixed the railings.
-Minor tile fixes
*MechFab
-Machines are now unlocked.
*Survival SecurityV2
-Fixed airless tiles.
-Stripped access requirements
 2023-03-03 22:20:22 -05:00
Kassc
52c445008c Merge pull request #5798 from tacoguy7765093/krakatoa 
Ports Lavaland tiles
 2023-03-03 21:21:40 -05:00
Kassc
edb59bd4a3 Merge pull request #5812 from TheGreatKitsune/item-tf-spawn 
Item TF spawnpoints
 2023-03-03 21:18:08 -05:00
Fluff
190e4a0cb6 Balancing mobs slightly 
Mostly made the tesharis more zoomy with their guns.
 2023-03-03 12:05:21 -05:00
Rykka Stormheart
640a73cb06 Adds Deafened Feedback, enhances looping sounds further 
Adds deafened ear ring that plays any time you're deafened, and fades back in once you can hear again.

Example of deafened feedback [here](https://streamable.com/8s8vlu). 

Worry not, if you're deafened via mutation or other, you'll simply go deaf, and only hear the fade-in once you regain hearing. 

It will also only play **once** when you are deafened. Further deafening effects while you are already deaf will not force you to hear it again.
 2023-03-03 04:08:08 -08:00
Sharkmare
476af4b90b Update preferences.dm 2023-03-03 01:08:48 +01:00
Fluff
9bfb9f008a Fixing things 
-Removed the EMP grenade thing
-Made is so the pummler and hound are a bit bigger then their sprites
-Added names.
 2023-03-02 08:42:14 -05:00
Fluff
b2387a7dbf Swapping two sprites 
Opps, shotgun wuff and shotgun tesh sprites are wrong
 2023-03-01 23:33:13 -05:00
Fluff
26b7ca68a5 Eclipse mobs 
Adding a new little group of mobs.
 2023-03-01 23:18:10 -05:00
Fluff
d6a20ce664 Mouse Army Works 
The icons for the mouse army tiny mice is some weird jank code that clearly doesn't work.
I just added the normal way of the sprites working.
 2023-03-01 23:13:08 -05:00
Seris02
f95ae5a000 why do I do this to myself 2023-03-01 10:52:27 +08:00
Seris02
fba91c6afd stops proteans from selecting promethean 2023-03-01 09:17:04 +08:00
Sharkmare
f300ea8afc Even saner lists 2023-02-28 12:41:18 +01:00
Sharkmare
9c739fa94c Make the list more sane 2023-02-28 08:29:48 +01:00
Sharkmare
68dd41276d Globalize the Voice list and fetching 2023-02-28 08:02:38 +01:00
Razgriz
84ab7c421d Merge pull request #4176 from BlackMajor/protean-rework 
Protean rework part 2 (WIP)
 2023-02-27 19:09:14 -07:00
TheGreatKitsune
1d36a4215d Item TF spawnpoints 2023-02-26 15:43:47 -06:00
Razgriz
34cffc0887 Merge pull request #5774 from Kazzc/MoreSuperPoseShelters 
Additional SuperPose Maps and fixes.
 2023-02-26 00:54:59 -07:00
Bib Bob
5c49d065a2 remove bad commented code 2023-02-26 00:39:22 -06:00
Razgriz
108bbb1e52 Merge pull request #5771 from Seris02/extrastuff 
synthnaga tail, four ears ears, updated digi guilmon markings
 2023-02-25 22:25:28 -07:00
Fluff
90eccca7a2 More Xenomoprhs from Mexcio 
A new variety of Xenomoprhs.
All of them made by Kassc.
They had a map of var edited xenomorphs.
I officially coded them in.
 2023-02-24 19:24:04 -05:00
Kassc
5403f039f7 Additional SuperPose Maps and fixes. 
*LargeAlienShip-57x25
-Should spawn properly now.
-Food vending machines nerfed.
-Various item nerfs.
*TradingShip-40x22
-Food vending machines nerfed.
-Various item nerfs. (removed combat pod. Oof)
*Thanks for SlaysInDutch#4302 we now have more pods!
BrodcastingPod-11x9
DemonPoolV2-43x28
PirateShip-13x30
SurvivalHomeV2-9x9
SurvivalMechFab-9x9
SurvivalMethLab-9x10
SurvivalScience2-9x9
SurvivalSecurity2-9x9
HillOutpost-15x11
 2023-02-23 17:25:49 -05:00
Seris02
9ec91ba026 moar stuff - synthnaga tail, four ears ears, updated digi guilmon markings 2023-02-23 11:44:43 +08:00
BlackMajor
7f52a2318b Merge pull request #5727 from Seris02/radiohelping 
stops radios from dropping out every second message
 2023-02-23 14:42:15 +13:00
BlackMajor
382d8694f0 Merge pull request #5738 from Seris02/digiunbad 
makes tails/wings show underneath bodyparts (makes more difference on digitigrades)
 2023-02-23 14:41:50 +13:00
BlackMajor
2cf320e897 Merge branch 'master' into protean-rework 2023-02-23 14:31:09 +13:00
Nadyr
27658df697 Merge branch 'master' into OvermapDynamicPOIs 2023-02-21 20:03:22 -05:00
Darlantan
1048eaecd2 Adds comments for mappers 2023-02-21 19:47:54 -05:00
Razgriz
af042bb8b4 Merge pull request #5763 from CHOMPStation2/upstream-merge-14512 
[MIRROR] Expands player tip lists with some new ones. Changes some weights
 2023-02-20 16:49:25 -07:00
Razgriz
c3b2c5bd60 picking and choosing 2023-02-20 16:30:54 -07:00
Razgriz
d83309714e Merge pull request #5761 from Seris02/digishoeblood 
digitigrade shoe blood overlay
 2023-02-20 16:19:54 -07:00
Razgriz
8c236865a4 Merge pull request #5754 from FluffMedic/Rigsuits 
Precursor Rigsuit
 2023-02-20 16:00:39 -07:00
Razgriz
3d3861b03f Merge pull request #5737 from Seris02/gargoyle 
gargoyles
 2023-02-20 15:11:27 -07:00
Seris02
0e27736307 digitigrade shoe blood overlay 2023-02-19 18:02:33 +08:00
Fluff
863a499caf Precursor Rigsuit 
Adds a precursor rigsuit called the Xenotech rig, assuming I did the non-code name changes correctly. It's rather resource intensive but overall worth the research and materials.
 2023-02-18 13:11:37 -05:00
Seris02
a3c97cf926 makes a couple Entered() procs call parent as well - bellies + disposals 2023-02-18 11:47:27 +08:00