cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,052 Commits 8 Branches 0 Tags
cbac08888924ac8aca6a4f5dd28c9fcd3cf7cda9
Commit Graph

331 Commits

Author SHA1 Message Date
Seris02
abc62d2d89 petrification interface 2023-03-23 16:43:42 +08: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
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
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
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
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