cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-25 01:22:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,075 Commits 7 Branches 0 Tags
81c76088bf36e05a84bfc7aa92363fdd533b5110
Commit Graph

10608 Commits

Author SHA1 Message Date
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
Razgriz
c3ce02d546 Merge pull request #5976 from Sharkmare/patch-21 
Brings Communicators further in line with DPAs
 2023-03-22 14:36:26 -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
Sharkmare
56b320d093 comment 2023-03-19 20:56:49 +01:00
Sharkmare
41e8e1fa4b Brings Communicators further in line with DPAs 
Allows mounting Comm watches to the belt and ID slot just like the regular communicator (just like the wrist mounted PDA)
 2023-03-19 20:45:59 +01:00
Nadyr
1c4d605536 Merge pull request #5972 from CHOMPStation2/upstream-merge-14707 
[MIRROR] Should fix props being un-var-editable
 2023-03-19 08:58:41 -04:00
Nadyr
2dda11b280 powder that makes you say yes 2023-03-19 08:56:21 -04:00
Nadyr
d26efab377 Merge pull request #5964 from Sharkmare/patch-20 
Adding an ID slot to the Communicator
 2023-03-19 08:40:37 -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
Sharkmare
c42510c309 Adding an ID slot to the Communicator 
Allows you to slot your scanned ID into your communicator
 2023-03-17 23:15:56 +01:00
Heroman3003
d2543ddf47 Merge pull request #14678 from KillianKirilenko/kk-talontweaks 
Frozen Organ Crates
 2023-03-17 21:05:28 +00:00
Nadyr
25ef364bd2 Merge pull request #5960 from CHOMPStation2/upstream-merge-14701 
[MIRROR] Shuttle Bay signs
 2023-03-17 04:03:28 -04:00
Nadyr
c74dd3431a Merge pull request #5958 from Sharkmare/patch-19 
Jar + Small people
 2023-03-17 04:02:25 -04:00
Nadyr
0fc70ed7d1 Merge pull request #5928 from CHOMPStation2/upstream-merge-14684 
[MIRROR] [MIRROR] Fixes a raunchy typo
 2023-03-17 03:25:05 -04:00
Nadyr
d26d90028d Merge pull request #5934 from CHOMPStation2/upstream-merge-14662 
[MIRROR] Weapon Info on Examine
 2023-03-17 03:19:20 -04:00
Nadyr
7a0786754b Merge branch 'master' into upstream-merge-14684 2023-03-17 03:10:41 -04:00
Nadyr
bd908dac14 Merge pull request #5927 from CHOMPStation2/upstream-merge-14681 
[MIRROR] [MIRROR] Sheet storage has different caps per type.
 2023-03-17 03:09:26 -04:00
Nadyr
506661f8f4 Merge pull request #5919 from CHOMPStation2/upstream-merge-14551 
[MIRROR] [MIRROR] /tg/ era language pass
 2023-03-17 02:40:16 -04:00
Nadyr
d6bc869634 Merge pull request #5897 from CHOMPStation2/upstream-merge-14649 
[MIRROR] cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else
 2023-03-17 01:52:29 -04:00
Nadyr
fdc9c63123 Merge pull request #5905 from TheGreatKitsune/morgue-fix 
Fixes crematoriums sometimes getting broken when opening
 2023-03-17 01:49:03 -04:00
Heroman3003
b333971955 Shuttle Bay signs 2023-03-17 01:06:16 +00:00
Sharkmare
3231d8c9fc fixed? 2023-03-16 14:03:17 +01:00
Sharkmare
eaca1b5455 Jar + Small people 
Do i need to explain further?
 2023-03-16 13:55:12 +01:00
Heroman3003
5922267371 Merge pull request #14662 from KillianKirilenko/kk-wepdesc 
Weapon Info on Examine
 2023-03-14 18:44:19 +00:00
Heroman3003
23df1fdc43 [MIRROR] Fixes a raunchy typo 2023-03-14 08:09:21 +00:00
Heroman3003
18002a78a1 Merge pull request #14681 from VOREStation/upstream-merge-9029 
[MIRROR] Sheet storage has different caps per type.
 2023-03-14 08:08:13 +00:00
Heroman3003
025fac4bf9 [MIRROR] /tg/ era language pass 2023-03-13 05:23:57 +00:00
TheGreatKitsune
dc89ee8f88 Fixes crematoriums sometimes getting broken when opening 2023-03-11 22:34:53 -06:00
Novacat
230498d990 Merge pull request #14659 from Heroman3003/mre-and-int 
Two fix
 2023-03-12 04:33:32 +00:00
Rykka Stormheart
69aee543a0 Gotta typecast, oops 2023-03-10 03:59:19 -08:00
Rykka Stormheart
89b05ca18b Fixes Explosions runtiming 
Explosions will no longer try to play the deaf_loop on ghosts and then cause a runtime.
 2023-03-10 03:47:03 -08:00
Heroman3003
8ab9a847d0 cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else 2023-03-10 06:51:22 +00:00
Nadyr
8e87297f90 Merge pull request #5883 from CHOMPStation2/upstream-merge-14583 
[MIRROR] more fixed admin hrefs
 2023-03-09 21:23:50 -05:00
Nadyr
3cd859e7e9 Merge pull request #5875 from CHOMPStation2/upstream-merge-14591 
[MIRROR] Adds new POI to RP, creates scug spawner object
 2023-03-09 20:55:20 -05:00
Nadyr
7baa5027ef Merge pull request #5857 from RinPin/master 
Adds green fox plushie!
 2023-03-09 20:37:03 -05:00
Heroman3003
4fff3b4226 Merge pull request #14583 from Seris02/adminjumplink 
more fixed admin hrefs
 2023-03-09 05:08:26 +00:00
Casey
4273cca010 Merge pull request #14591 from Runa-Dacino/scugpicnic 
Adds new POI to RP, creates scug spawner object
 2023-03-08 19:07:40 +00:00
Heroman3003
62d770eafe Character Setup Lore Option Tweaks 2023-03-06 13:29:45 -05:00
Heroman3003
ce5ef389b3 Custom Species name in Records 2023-03-06 12:59:00 -05:00
RinPin
edaad07ea8 Adds green fox plushie! 
Adds a green fox plushie to the game and loadout. to go with the other colored fox plushies.
 2023-03-05 20:29:54 -03: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
Kassc
edb59bd4a3 Merge pull request #5812 from TheGreatKitsune/item-tf-spawn 
Item TF spawnpoints
 2023-03-03 21:18:08 -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
Razgriz
ada3e13709 Make ticket printer smaller 
Because something so small, trivial, and used for silly RP should not be practically gigantic.
 2023-02-27 16:54:21 -07:00
Nadyr
8f2312988b Merge pull request #5807 from CHOMPStation2/upstream-merge-14566 
[MIRROR] Makes SD wall lockers properly visible
 2023-02-27 02:17:07 -05:00
Nadyr
34208c191b Merge pull request #5785 from CHOMPStation2/upstream-merge-14547 
[MIRROR] Ghost pod for debris POI moved into its own separate PR
 2023-02-27 02:08:18 -05:00
TheGreatKitsune
1d36a4215d Item TF spawnpoints 2023-02-26 15:43:47 -06:00
Casey
594ec63a8b Makes SD wall lockers properly visible 2023-02-26 18:10:04 +00:00