cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
77,732 Commits 8 Branches 0 Tags
5b51a657d42228f559d974c8fc20b0ee18c6456d
Commit Graph

955 Commits

Author SHA1 Message Date
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
Seris02
fb677ceee1 better gargoyle code 2023-03-18 19:56:35 +08:00
Fluff
4e8d6ec97e Nerfed the pummler 
Made it so the pummler reloads more often
 2023-03-17 23:52:23 -04: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
68fdbd36c7 Fixes 
Fix even more of the things.
Lava not exsisting on cliffs, a typo, and using the wrong area for a POI.
 2023-03-15 19:05:50 -04: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
ffd571a08c Fixing the things 
-Nerfed Eclipse mobs. Screw it, they're made for the valley, they're apart of it now.
-Fixed some wierd sprite stuff with the xenos
-Deleted some stealth mice.
 2023-03-15 08:53:17 -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
TheGreatKitsune
97701e8b3f Adds loadout capture crystals! 2023-03-13 16:58:03 -05:00
LukasJuergens
a52ecf2637 New capture crystal type 
Adds a new (cheap) capture crystal that only works on crew, not animals or carbon mobs with no client.
 2023-03-13 22:07:59 +01: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
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
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
0f512330b3 Small oversight fix 2023-03-09 19:39:01 +01:00
Sharkmare
2a4209c2bd forgot to divide the iteration 2023-03-09 13:22:41 +01:00
Sharkmare
40b112da74 alternate rlist generator 
Arlist() takes a single list argument and generate an rlist from it
 2023-03-09 12:32:28 +01:00
Sharkmare
d283a7681b Refactored talk_sound_map 
This restructueres talk sound map entirely  into a different list format because auto key fetching was messing up. debugging this took a while.
 2023-03-09 12:11:39 +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
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
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
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
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