cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-17 21:53:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,075 Commits 9 Branches 0 Tags
81c76088bf36e05a84bfc7aa92363fdd533b5110
Commit Graph

20585 Commits

Author SHA1 Message Date
Rykka Stormheart
e601048e13 Fixes error with Species Sounds 
Unset ran into an error that did not occur during testing - select_default_species_sound was changed to use pref instead of user, and the testing calls were not updated.

Unathi had no species sounds.
 2023-03-23 05:10:29 -07: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
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
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
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
Nadyr
b32b0bc4cd Merge pull request #5962 from CHOMPStation2/upstream-merge-14702 
[MIRROR] Fixes some bugs/QoL with guest pass terminals
 2023-03-19 08:40:22 -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
Nadyr
2487412774 powder that makes you say yes 2023-03-17 20:38:35 -04: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
Heroman3003
ef93cdb6e0 Fixes some bugs/QoL with guest pass terminals 2023-03-17 21:04:21 +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
bef463aa37 Merge pull request #5953 from Sharkmare/patch-17 
Adds a new HOP alt title
 2023-03-17 03:54:12 -04:00
Nadyr
b062e6c41e Merge pull request #5939 from CHOMPStation2/upstream-merge-14618 
[MIRROR] Adds a new mech weapon, the GA-X Experimental Gamma Laser
 2023-03-17 03:40:40 -04:00
Nadyr
2b4819d37b Merge pull request #5945 from CHOMPStation2/upstream-merge-14601 
[MIRROR] [MIRROR] AI can change their hologram color.
 2023-03-17 03:39:52 -04:00
Nadyr
0f6ce49020 Merge pull request #5940 from CHOMPStation2/upstream-merge-14679 
[MIRROR] Allows quickreplace of flooring types that use nonstandard plating
 2023-03-17 03:27:47 -04:00
Nadyr
fcecc6e0a5 powder that makes you say yes 2023-03-17 03:27:15 -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
8a693c6c71 powder that makes you say yes 2023-03-17 02:20:31 -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
Nadyr
506ac4c1a2 Merge pull request #5904 from CHOMPStation2/upstream-merge-14659 
[MIRROR] Two fix
 2023-03-17 01:48:07 -04:00
Nadyr
2ba0162576 powder that makes you say yes 2023-03-17 00:59:30 -04:00
Nadyr
c8ebdf68e9 Merge pull request #5888 from CHOMPStation2/upstream-merge-14624 
[MIRROR] Resolves SDMM warnings
 2023-03-17 00:53:08 -04:00
Nadyr
67686664e6 Merge pull request #5881 from tacoguy7765093/better-diggy 
You can put floor tiles on sif grass
 2023-03-17 00:52:11 -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
Sharkmare
41447ef00e Adds a new HOP alt title 
Adds the "Performance Management Supervisor" Alt title as an analog to the Captain's "Chief Supervisor" themed role
Just like we have Facility Director and Facility Steward
 2023-03-16 04:55:48 +01:00
Heroman3003
a0fdea6bbe Merge pull request #14601 from VOREStation/upstream-merge-8955 
[MIRROR] AI can change their hologram color.
 2023-03-14 22:08:05 +00:00
Heroman3003
3ba9e698c2 Merge pull request #14679 from Cyantime/patch-2 
Allows quickreplace of flooring types that use nonstandard plating
 2023-03-14 21:42:59 +00:00
Heroman3003
826138cf89 Adds a new mech weapon, the GA-X Experimental Gamma Laser 2023-03-14 21:41:53 +00: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