cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,172 Commits 5 Branches 0 Tags
83dcbb29a815f3943bb19168d0a38bcf9ba86b8e
Commit Graph

348 Commits

Author SHA1 Message Date
Nadyr
0cac272b30 Merge pull request #6016 from FluffMedic/CultAdjust 
Fixing File Pathing
 2023-04-02 19:31:40 -04:00
Nadyr
5f504b2c2f Merge pull request #6013 from TheGreatKitsune/vox-clothing-fix 
Restore some vox clothing that was lost [FIXES #5992]
 2023-04-02 19:30:05 -04:00
Fluff
c276482f77 Fixing File Pathing 
Something was invisible because of incorrect file pathing. Fixed that.
 2023-04-02 08:45:43 -04:00
Razgriz
ee54791e47 Merge pull request #6001 from Rykka-Stormheart/shep-dev-spec-fix-2 
Species Sounds Hotfix 2
 2023-04-01 18:59:39 -07:00
TheGreatKitsune
3f3816ddb4 Restore some vox clothing that was lost 2023-04-01 13:10:26 -05:00
Nadyr
a934760b85 Merge pull request #6002 from FluffMedic/CultAdjust 
Adjusts cult speed, adds nibbles for two, and hitscan
 2023-03-31 19:29:17 -04:00
Nadyr
51f4cf8ac7 Merge pull request #5983 from Seris02/petrificationmachine 
small petrification interface next to the alien machine in maint
 2023-03-31 18:49:42 -04:00
Fluff
be09625160 Fixing a typo, and make the boss function 
Rift mangus does not exsist with pain, aka players nuke them to oblivion once they try to melee.
And uhhh nuked the typo that made more mobs.
 2023-03-31 13:35:05 -04:00
Fluff
a92fcd8e15 Fixed a typo 
Fixed a typo
 2023-03-29 20:07:48 -04:00
Fluff
06e0ccc7e1 Adjusts cult speed, adds nibbles for two, and hitscan 
get off the mobs.
 2023-03-29 19:08:06 -04:00
Rykka Stormheart
c4921dfdf7 Species Sounds Hotfix 2 
Gives Cough/Sneeze/Gasp back default sounds if they lack one in their species list.
Fixes death sound doubling up.
Fixes runtime in sounds - it will now simply return null rather than trying to index the list and failing.
 2023-03-28 21:01:49 -07:00
Seris02
abc62d2d89 petrification interface 2023-03-23 16:43:42 +08:00
Razgriz
c057f9f0f8 Merge pull request #5813 from Rykka-Stormheart/shep-dev-barky-noises 
Sound Update: Mob Species Sounds (Gasp/Scream/Pain/Death/Cough/Sneeze)
 2023-03-22 14:32:04 -07:00
Nadyr
e8e59fdb25 Merge pull request #5974 from FluffMedic/BossFight 
Rift Magnus adjustment
 2023-03-19 09:02:36 -04:00
Fluff
c469f9460e Some more adjustment 
Stupid thing
 2023-03-18 18:39:27 -04:00
Fluff
424d4c19d1 Rift Magnus adjustment 
Added 10 seconds to the magnus's melee attack to account of the teleport stun.
 2023-03-18 18:34:53 -04:00
Seris02
d7f838e608 I hate byond sometimes 2023-03-19 01:03:53 +08:00
Seris02
985ab0309d better defines 2023-03-18 20:13:10 +08:00
Kassc
4b1c844e73 Merge pull request #5903 from tacoguy7765093/pizza-tower 
Pizza Parlor Superpose Pod
 2023-03-17 18:26:27 -04:00
Nadyr
175018e88d Merge pull request #5950 from FluffMedic/Custom 
Kitsune taur
 2023-03-17 03:50:19 -04:00
Nadyr
8a0725de95 Merge pull request #5871 from Sharkmare/patch-14 
Fleshtaker mimicry mob
 2023-03-17 03:48:24 -04:00
Nadyr
977b3c0a28 Merge pull request #5908 from FluffMedic/Armor 
Material armor is no longer all steel
 2023-03-17 03:46:30 -04:00
Nadyr
8256c33738 Merge pull request #5946 from FluffMedic/BossFight 
Triple Trouble
 2023-03-17 03:41:45 -04:00
Nadyr
96d713d195 Merge pull request #5925 from FluffMedic/Nerfs 
Fixes material paradox
 2023-03-17 03:04:13 -04:00
Bib Bob
06c26a9ad5 typo 2023-03-17 01:27:16 -05:00
Fluff
5571b75277 Kitsune taur 
Made a variant of the fox taur for a kitsune taur. Many tails goooood....I'll never use this but some want it.
 2023-03-15 14:32:01 -04:00
Fluff
2a7a02594d Fix 
Removed a projectile that no longer exsits.
 2023-03-14 18:53:31 -04:00
Fluff
f1b291cb35 Merge remote-tracking branch 'origin/BossFight' into BossFight 2023-03-14 18:49:00 -04:00
Fluff
499ff779c1 Triple Trouble 
Imma write an actual description on git
 2023-03-14 18:47:26 -04:00
Fluff
f5ad5ed00a Fixes material paradox 
Opps, rigsuits can be deconstructed.
Wil no longer go plus on resources when deconstructing certian ones.
 2023-03-13 18:20:04 -04:00
Fluff
6dff7e8161 Material armor is no longer all steel 
Like seriously most things used just defualt stuff for the protection/armory vaules and it annoyed me.
Steel's default
Protection: 10
Reflective: 0
Hardness: 60
 2023-03-12 13:21:31 -04:00
Bib Bob
fbd0ab1aea pizza parlor superposed pod 2023-03-11 15:40:37 -06:00
Razgriz
0cc406edc9 Restore old brute and burn damages to proteans 
Brute mod from 1 to 0.8
Burn mod from 1 to 1.5
 2023-03-10 19:39:35 -07:00
Razgriz
c38b03a06b Restore old brute and burn damages to proteans 
Brute mod from 1 to 0.8
Burn mod from 1 to 1.5
 2023-03-10 19:29:34 -07:00
Rykka Stormheart
f8bbb5790d Merge branch 'master' into shep-dev-barky-noises 2023-03-10 01:54:26 -08:00
Sharkmare
cb088f5704 forgot to toggle the flesh_mimic flag 2023-03-10 01:22:26 +01:00
Sharkmare
bd21e73270 armor theft 2023-03-10 00:37:26 +01:00
Sharkmare
50ec79f9cc Fixing some Icon issuees 2023-03-10 00:29:40 +01:00
Sharkmare
99188fda93 update icon on revert and theft 2023-03-08 23:08:02 +01:00
Sharkmare
32394ec3c1 faction addition 2023-03-08 23:05:29 +01:00
Sharkmare
c28d87a1e7 Damage and Health theft 2023-03-08 22:46:15 +01:00
Sharkmare
bc516a407e fix filename and restructure for mapping ease 2023-03-08 22:36:29 +01:00
Sharkmare
073af35176 Fleshtaker mimicry mob 
A simple concept of a mob taking over other mindless mobs to strengthen and protect itself

Work in progress,
 2023-03-08 15:10:07 +01:00
Rykka Stormheart
da9c38b689 Merge remote-tracking branch 'upstream/master' into shep-dev-barky-noises 2023-03-04 16:01:30 -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