cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-20 22:33:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,373 Commits 8 Branches 0 Tags
524cd2e671d16d8683cbeccc0a5ed042de71aba9
Commit Graph

33308 Commits

Author SHA1 Message Date
Casey
524cd2e671 Adds personal shield generators. [READY FOR MERGE] 2022-09-23 00:53:41 +00:00
Nadyr
fb0780fb4f Merge pull request #4972 from xnqm8h/4971-suspension-field-sprite-missing 
Updates sprite location for new Suspension Field Generator FIXES #4971
 2022-09-21 23:51:46 -04:00
Nadyr
a4118ae534 Merge pull request #4967 from xnqm8h/3893-protolathe-drone-assemblies 
Adds the other drone assemblies to the protolathe FIXES #3893
 2022-09-21 23:51:03 -04:00
Nadyr
3f27645c5a Merge pull request #4966 from xnqm8h/4965-clown-stamp 
Clown stamp is now usable by alt title entertainers FIXES #4965
 2022-09-21 23:45:17 -04:00
Nadyr
0f3a67cf10 Merge pull request #4928 from xnqm8h/cargo-tug-fix-41 
Adds paralysis and sleeping checks to trains. FIXES #41
 2022-09-21 23:42:45 -04:00
Desert
909892ff72 Updates sprite location for new Suspension Field Generator FIXES #4971 
Updates the location for the sprites, including the one for when the device is on and wrenched down.

Also fixes an issue where the user could open the maintenance hatch, lock the device, then close the TGUI window. This would prevent them from being able to open the TGUI window to unlock it and they would get an access denied message when trying to close the hatch.
 2022-09-21 16:12:48 -05:00
Desert
5534566f08 Adds the other drone assemblies to the protolathe FIXES #3893 2022-09-20 21:05:49 -05:00
Desert
210813ef44 Clown stamp is now usable by alt title entertainers FIXES #4965 2022-09-20 18:47:08 -05:00
Desert
cec3326822 Add in chompstation comments. 2022-09-18 22:55:53 -05:00
Nadyr
cf8ada40c1 Merge pull request #4938 from CHOMPStation2/upstream-merge-13738 
[MIRROR] Fixes some adminverb runtimes
 2022-09-18 21:14:10 -04:00
Nadyr
8e50c6cfd9 Merge pull request #4960 from CHOMPStation2/upstream-merge-13750 
[MIRROR] Adds more altevian content
 2022-09-18 21:13:27 -04:00
Nadyr
1013933484 Merge pull request #4957 from CHOMPStation2/upstream-merge-13753 
[MIRROR] Fixes belly air for phoron/nitrogen breathers
 2022-09-18 21:12:42 -04:00
Nadyr
baaa142998 Merge pull request #4955 from CHOMPStation2/upstream-merge-13744 
[MIRROR] Add charger penalty to biofuel processors
 2022-09-18 21:12:03 -04:00
Nadyr
8a03af13fa Merge pull request #4905 from CHOMPStation2/upstream-merge-13709 
[MIRROR] Removes last references to simple_animal
 2022-09-18 21:11:22 -04:00
Nadyr
39fd54bae7 Merge pull request #4950 from CHOMPStation2/upstream-merge-13726 
[MIRROR] Fixes runtime with loading bad-saved langaugaes
 2022-09-18 20:53:46 -04:00
Nadyr
5c82dcec87 Merge pull request #4964 from CHOMPStation2/upstream-merge-13757 
[MIRROR] Attempts to fix simplemob pref loading
 2022-09-18 20:53:22 -04:00
Nadyr
2a7c74b4ed Merge pull request #4959 from CHOMPStation2/upstream-merge-13751 
[MIRROR] Fixes runtime with capture crystal pref
 2022-09-18 20:50:02 -04:00
Nadyr
eab9750fe2 Merge pull request #4958 from CHOMPStation2/upstream-merge-13752 
[MIRROR] Adds spookyghost sanity check
 2022-09-18 20:49:42 -04:00
Nadyr
1a5882ac7b powder that makes you say yes 2022-09-18 20:48:56 -04:00
Nadyr
d105ac9b3a Merge pull request #4956 from CHOMPStation2/upstream-merge-13745 
[MIRROR] Removes a redundant icon update
 2022-09-18 20:47:15 -04:00
Nadyr
0d6061b4dc powder that makes you say yes 2022-09-18 20:46:45 -04:00
Nadyr
89d3735adf Merge pull request #4951 from CHOMPStation2/upstream-merge-13742 
[MIRROR] Fixes a few more runtimes.
 2022-09-18 20:41:50 -04:00
Nadyr
9ddb5634e6 Merge pull request #4946 from CHOMPStation2/upstream-merge-13723 
[MIRROR] Brings silence to the world of ghosts
 2022-09-18 20:39:31 -04:00
Nadyr
afbd5fa20c Merge pull request #4945 from CHOMPStation2/upstream-merge-13725 
[MIRROR] Fixes bottle throwing
 2022-09-18 20:39:02 -04:00
Nadyr
e9a8efd143 Merge pull request #4944 from CHOMPStation2/upstream-merge-13637 
[MIRROR] [VChat QoL] Minifies JS & Updates Vue
 2022-09-18 20:38:21 -04:00
Nadyr
2fd798057b Merge pull request #4939 from CHOMPStation2/upstream-merge-13737 
[MIRROR] Some staff-specific pref staff
 2022-09-18 20:36:02 -04:00
Nadyr
e62c484dda powder that makes you say yes 2022-09-18 20:34:31 -04:00
Nadyr
6fc323c3cb Merge pull request #4937 from CHOMPStation2/upstream-merge-13736 
[MIRROR] Fixes runtime with weather
 2022-09-18 20:33:07 -04:00
Nadyr
600f2dee45 Merge pull request #4922 from CHOMPStation2/upstream-merge-13718 
[MIRROR] Makes it possible to tell how many cards someone has in a hand.
 2022-09-18 20:27:46 -04:00
Nadyr
6acd65857e Merge pull request #4921 from CHOMPStation2/upstream-merge-13719 
[MIRROR] Fixes appleberry bits disappearing
 2022-09-18 20:27:15 -04:00
Nadyr
da37649ff4 Merge pull request #4918 from CHOMPStation2/upstream-merge-13717 
[MIRROR] Fixes tf ray simplemob id gender runtime
 2022-09-18 20:25:14 -04:00
Nadyr
047c78d659 Merge pull request #4917 from Verkister/patch-92 
Earlyports fix for cleanbot runtime spam
 2022-09-18 20:24:25 -04:00
Nadyr
8980ec81f5 Merge pull request #4901 from CHOMPStation2/upstream-merge-13698 
[MIRROR] Makes wounds take time to disappear again to fix bleeding surgery
 2022-09-18 20:21:38 -04:00
Casey
7168f8ef99 Merge pull request #13757 from Heroman3003/pref-loading-client 
Attempts to fix simplemob pref loading
 2022-09-18 14:05:55 +00:00
Casey
f2716e95ae Adds more altevian content 2022-09-18 09:39:22 +00:00
Casey
f9633cb139 Merge pull request #13751 from Heroman3003/capture-runtime 
Fixes runtime with capture crystal pref
 2022-09-18 09:39:18 +00:00
Casey
88493f4876 Merge pull request #13752 from Heroman3003/spookyghost-sanity 
Adds spookyghost sanity check
 2022-09-18 09:39:14 +00:00
Casey
d1f4654b5c Fixes belly air for phoron/nitrogen breathers 2022-09-18 09:39:10 +00:00
Casey
3b2b559b00 Merge pull request #13745 from Verkister/patch-124 
Removes a redundant icon update
 2022-09-18 09:38:00 +00:00
Casey
6677ba69d3 Add charger penalty to biofuel processors 2022-09-18 09:36:54 +00:00
Casey
08c0ad1753 Merge pull request #13742 from Heroman3003/moreruntimes 
Fixes a few more runtimes.
 2022-09-18 09:35:35 +00:00
Casey
5e3d6d8202 Merge pull request #13726 from Heroman3003/langslot-runtime 
Fixes runtime with loading bad-saved langaugaes
 2022-09-18 09:34:28 +00:00
Casey
9c8e1d4ffe Merge pull request #13723 from Heroman3003/SILENCE 
Brings silence to the world of ghosts
 2022-09-18 09:33:09 +00:00
Casey
8d0e07839a Merge pull request #13725 from Heroman3003/bottlefix 
Fixes bottle throwing
 2022-09-18 09:33:05 +00:00
Casey
6e67879063 Merge pull request #13637 from ItsSelis/vchat-qol1 
[VChat QoL] Minifies JS & Updates Vue
 2022-09-18 09:31:57 +00:00
Razgriz
bb62f549a2 Actually allow punpun to be spont nommed 2022-09-16 01:08:11 -07:00
Razgriz
6130f4e0fd you're not the punpun I'm looking for 2022-09-16 00:59:50 -07:00
Razgriz
0ba0d124c7 Allow punpun to be spontaneous vored 2022-09-16 00:45:03 -07:00
Razgriz
162f6c5eff Enable spontaneous prey for all mobs 2022-09-16 00:43:30 -07:00
Novacat
22e1a26d4e Merge pull request #13737 from Heroman3003/admin-toggles 
Some staff-specific pref staff
 2022-09-15 13:52:38 +00:00