cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-14 11:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
76,118 Commits 8 Branches 0 Tags
a7d7ec8d87643fb9feb6bd5f2dd28071c70ce3e7
Commit Graph

2583 Commits

Author SHA1 Message Date
CHOMPStation2
ec735809c5 [MIRROR] A bunch of small fixes (#6820) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-16 09:46:36 +02:00
CHOMPStation2
51b73e8042 [MIRROR] [READY] Removes Dogborgs (#6763) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: kcin2001 <rnlb2001@gmail.com>
 2023-08-14 08:01:48 +02:00
BlackMajor
71c9c94757 Quick RCD fixes (#6742) 2023-08-07 07:51:58 +02:00
BlackMajor
7fd1ff3dc5 RCD Improvements + Holofans + fixes (#6738) 2023-08-06 17:07:59 +02:00
CHOMPStation2
04857c569e [MIRROR] hotsprings (#6727) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-06 01:05:36 +02:00
Verkister
dcb169f1d3 New grille sprites (#6655) 2023-07-27 07:54:07 +02:00
Raeschen
071905fed5 Fix lost changes (#6633) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Raeschen <Raeschen@users.noreply.github.com>
Co-authored-by: FluffMedic <109300046+FluffMedic@users.noreply.github.com>
Co-authored-by: Victor Zisthus <56660717+VictorZisthus@users.noreply.github.com>
Co-authored-by: Razgriz1032 <Razgriz1032@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: purplefoxy27 <38367315+purplefoxy27@users.noreply.github.com>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Aroliacue <96730930+Aroliacue@users.noreply.github.com>
 2023-07-21 08:44:40 +02:00
Victor Zisthus
2ca59be725 Brief Locker overhaul 
Emergency lockers and secure lockers now start anchored to the ground. If you want to move them, you'd better have access and a wrench.

Adjusted emergency lockers to have suit cooling units, and fixes the missing first aid kit in the 25% chance Aid roll.
 2023-07-15 20:51:16 -04:00
Raeschen
a7c603e2a6 Update window.dm 2023-07-07 09:51:15 +02:00
Heroman3003
e62d81af4b [MIRROR] the little construction pr 2023-07-07 07:30:36 +00:00
Razgriz
ffaaf30cdd accurate comments that make you say yes 2023-07-06 03:09:54 -07:00
Razgriz
f589c2c704 comments that make you say yes 2023-07-06 03:09:27 -07:00
Razgriz
6e2958a855 fixes that make you say yes 2023-07-06 02:58:30 -07:00
Raeschen
a21010de21 more missed names 2023-07-05 10:43:54 +02:00
Raeschen
23714a7b86 more chomp-specific name changes 2023-07-05 10:36:41 +02:00
Raeschen
2c9b7b1a59 mass renaming everything is a good thing right??? 2023-07-05 10:33:37 +02:00
Raeschen
1e2deb86ed missing comma 2023-07-05 10:21:45 +02:00
Raeschen
740a877f89 readd some chompedited stuff 2023-07-05 10:18:45 +02:00
Raeschen
0e680b38a5 missed conflict 2023-07-05 10:14:43 +02:00
Raeschen
3e0a0c0c98 big resync + merge conflicts 2023-07-05 10:12:39 +02:00
Casey
19550009ce Tweaks and tidying 2023-07-03 10:24:10 +00:00
Heroman3003
48926a6afb Merge pull request #15091 from Runa-Dacino/ghostpodstuff 
Fixes and tweaks "Survivor Pods"
 2023-06-28 21:34:39 +00:00
Casey
c8ab7b84d7 Merge pull request #15083 from Heroman3003/admin-log 
Adds admin logging to morph and maintpred ghost pods
 2023-06-26 19:43:20 +00:00
Heroman3003
9a2457d5aa Adds some altevian-themed props 2023-06-23 18:44:40 +00:00
Heroman3003
252b82a34c Merge pull request #15065 from Youtubeboy139/New-Decals 
Gonna paint the floors red... with hazard lines
 2023-06-22 18:07:52 +00:00
Raeschen
74765cf864 fix merge conflicts 2023-06-19 12:32:36 +02:00
Heroman3003
db38ed93c0 Spell Fixes 2023-06-19 04:40:45 +00:00
Raeschen
1cffb3f0e7 Merge pull request #6368 from Rykka-Stormheart/shep-dev-more-sounds 
Sound Additions + Tweaks
 2023-06-18 16:27:37 +02:00
Raeschen
2c3eefe326 Merge branch 'master' into upstream-merge-14976 2023-06-17 14:47:37 +02:00
Rykka Stormheart
1de51fb4b8 Sound Additions + Tweaks 
Changes listed below:
* Makes Death Sounds mutable on their own audio channel.
* Makes Ear Ringing use the HUD Channel for sounds

Additions:
* [Adds On Fire effect](https://streamable.com/c1fxeo)
* Adds Stunned effect(https://streamable.com/v2if0s)
* [Adds SMES humming based on power usage in/out. Affected by walls, will only play if in LOS and visible.](https://streamable.com/z41x90)
* [Adds Atmos Alerts making a noise on the monitor](https://streamable.com/uhegq6)
* [Tcomms + PDA servers hum when powered and active, also respects walls/LOS](https://streamable.com/vb08x1)
* [Fridges hum quietly while powered](https://streamable.com/c3zsz7)
* [Point Defense turrets now make a sound audible from inside the station when firing, to add more spice to meteor waves.](https://streamable.com/bf8mwl)
* Shield Generators now hum when active.
 2023-06-15 12:27:23 -07:00
Nadyr
088d87cb57 Merge pull request #6293 from CHOMPStation2/upstream-merge-14931 
[MIRROR] Items for the Plant People (not the literal plant people)
 2023-06-09 21:45:16 -04:00
Heroman3003
2281afdf24 More 515 Compatibility 2023-06-05 21:21:35 +00:00
Heroman3003
d41519dcb8 Items for the Plant People (not the literal plant people) 2023-06-02 01:22:32 +00:00
Heroman3003
b37a023823 Merge pull request #14912 from Youtubeboy139/Thaler-Change 
It's all bout that Money Money Money
 2023-06-01 20:36:54 +00:00
Nadyr
182873418f Merge branch 'master' into upstream-merge-14893 2023-05-29 18:41:05 -04:00
Nadyr
b8778e21ff Merge pull request #6242 from CHOMPStation2/upstream-merge-14880 
[MIRROR] Take me out to the Ball Game
 2023-05-29 18:38:32 -04:00
Heroman3003
338d5f605b TG Clothing Pack Polish 2023-05-25 02:27:29 +00:00
Heroman3003
f0a0c6d506 Merge pull request #14880 from Youtubeboy139/Take-me-out-to-the-Ball-Game 
Take me out to the Ball Game
 2023-05-25 02:12:54 +00:00
Heroman3003
ee3f93ba50 Merge pull request #14891 from KillianKirilenko/kk-tgfashion 
Dept. Gorka Suits
 2023-05-25 02:12:43 +00:00
Heroman3003
b31bdcc957 adds a smattering of clothes sourced from SR & TG 2023-05-21 23:49:31 -04:00
Verkister
9dc3f22d3a dropping a fat one 
Moves the code and sprites into their own files and fixes a whole bunch of stuff.
Also adds worn icons with 3 options ("full vac-pack", "tube only", and "hidden")
Also added the vac pack into janitor locker contents and into the janitor supply cargo pack.
 2023-05-07 20:00:58 +03:00
Heroman3003
65adc66899 Merge pull request #14760 from MisterGrimm/xenofixes 
Makes xeno egg ghost pods anchored
 2023-04-06 09:24:48 +00:00
Heroman3003
264d908ce7 Merge pull request #14751 from MisterGrimm/Xenoeggfix 
Replaces ghetto xenomorph egg, cleans up egg process
 2023-04-02 20:24:49 +00:00
Razgriz
4718e71c85 Merge pull request #5977 from Seris02/jellyfishnooo 
stops 'the space jellyfish bonks the window harmlessly. x1762'
 2023-03-22 14:36:42 -07:00
Nadyr
e6c049ef47 Merge pull request #5970 from CHOMPStation2/upstream-merge-14676 
[MIRROR] Mob tweaks and fixes
 2023-03-20 01:50:02 -04:00
Seris02
08b5274a95 the jellyfish bonks the window harmlessly.x1762 2023-03-20 12:42:03 +08:00
Nadyr
2dda11b280 powder that makes you say yes 2023-03-19 08:56:21 -04:00
Casey
2e3d51e095 Merge pull request #14707 from Heroman3003/propvaredit 
Should fix props being un-var-editable
 2023-03-18 21:01:44 +00:00
Casey
884f772c49 Mob tweaks and fixes 2023-03-18 20:56:26 +00:00
Heroman3003
d2543ddf47 Merge pull request #14678 from KillianKirilenko/kk-talontweaks 
Frozen Organ Crates
 2023-03-17 21:05:28 +00:00