cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-26 10:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,227 Commits 9 Branches 0 Tags
80fbb36627e16709c260ff1a6fd8da4e9f9e5f70
Commit Graph

32697 Commits

Author SHA1 Message Date
Razgriz
80fbb36627 Merge pull request #4498 from CHOMPStation2/upstream-merge-13267 
[MIRROR] That nice glow
 2022-07-04 21:24:50 -07:00
Razgriz
2923205b48 Merge pull request #4467 from CHOMPStation2/upstream-merge-13232 
[MIRROR] Makes gateway-spawned solargrubs not tracked by solargrub event
 2022-07-04 21:24:46 -07:00
Razgriz
bc41c8c2dc Merge branch 'master' into upstream-merge-13267 2022-07-03 17:22:19 -07:00
Razgriz
bb88a04785 powder that makes you say yes 2022-07-03 17:21:24 -07:00
Nadyr
f677239884 Merge pull request #4452 from CHOMPStation2/upstream-merge-13206 
[MIRROR] Moved Weight/Nutrition Prefs
 2022-07-03 20:19:53 -04:00
Razgriz
9182699a95 Merge pull request #4496 from CHOMPStation2/upstream-merge-13264 
[MIRROR] Fairy lights
 2022-07-03 17:19:23 -07:00
Razgriz
6efc4b5673 Merge pull request #4494 from CHOMPStation2/upstream-merge-13221 
[MIRROR] Reduces Post-Morten Pressure Damage
 2022-07-03 17:18:57 -07:00
Razgriz
cfa1d304eb Merge pull request #4492 from CHOMPStation2/upstream-merge-13261 
[MIRROR] Fixes a runtime preventing mob deletion
 2022-07-03 17:17:30 -07:00
Razgriz
ab46896ee1 Merge pull request #4490 from Verkister/patch-86 
Fixes runtime that breaks vorepanel.
 2022-07-03 17:17:14 -07:00
Razgriz
616a459808 Merge pull request #4489 from CHOMPStation2/upstream-merge-13257 
[MIRROR] Fixes produce persistance
 2022-07-03 17:17:04 -07:00
Razgriz
067d62d336 Merge pull request #4487 from CHOMPStation2/upstream-merge-13256 
[MIRROR] Allows pAIs to use signlang
 2022-07-03 17:15:48 -07:00
Razgriz
149dfc0d60 Merge pull request #4486 from CHOMPStation2/upstream-merge-13250 
[MIRROR] Makes AI catslugs unable to access-locked doors
 2022-07-03 17:15:41 -07:00
Razgriz
00011f99c2 Merge pull request #4484 from CHOMPStation2/upstream-merge-13254 
[MIRROR] Fixes smes not connecting to powernet on construction
 2022-07-03 17:15:22 -07:00
Razgriz
27bed6853c Merge pull request #4459 from CHOMPStation2/upstream-merge-13220 
[MIRROR] Makes all things that check for dorms check for forbid events var
 2022-07-03 17:15:03 -07:00
Razgriz
f5b87c8482 Merge pull request #4476 from CHOMPStation2/upstream-merge-13230 
[MIRROR] Makes artifact analyser prioritize artifacts
 2022-07-03 17:11:30 -07:00
Razgriz
52121921ec Merge pull request #4473 from CHOMPStation2/upstream-merge-13238 
[MIRROR] Trash eater tweak
 2022-07-03 17:10:12 -07:00
Razgriz
0eb34d57e1 Merge pull request #4472 from CHOMPStation2/upstream-merge-13237 
[MIRROR] Fixes character setup failing to update species icons
 2022-07-03 17:09:41 -07:00
Razgriz
0dc1c1a5b7 Merge pull request #4471 from TheGreatKitsune/ghost-antag-clarification 
Add section for Ghost roles to the Antagonism tab
 2022-07-03 17:09:27 -07:00
Razgriz
7ff9a1d2c2 Merge pull request #4470 from TheGreatKitsune/captain-announcement-silence 
All hands announce respects silent admin spawn
 2022-07-03 17:08:56 -07:00
Razgriz
ed515c6b0f Merge pull request #4469 from CHOMPStation2/upstream-merge-13229 
[MIRROR] Makes 'set ooc notes' use multiline textbox
 2022-07-03 17:08:35 -07:00
Razgriz
c27e08b3e2 powder that makes you say yes 2022-07-03 17:08:06 -07:00
Razgriz
9d4c7113de Merge pull request #4466 from CHOMPStation2/upstream-merge-13223 
[MIRROR] Reduces range of lightning strike zaps to 1
 2022-07-03 17:06:25 -07:00
Razgriz
542c8d001e Merge pull request #4464 from CHOMPStation2/upstream-merge-13228 
[MIRROR] Removes wooden bucket recipe from planks
 2022-07-03 17:05:50 -07:00
Razgriz
2348d7f301 Merge pull request #4462 from CHOMPStation2/upstream-merge-13236 
[MIRROR] Fixes blood moon transition breaking weather system
 2022-07-03 17:05:16 -07:00
Razgriz
470bf07b74 Merge pull request #4461 from CHOMPStation2/upstream-merge-13218 
[MIRROR] Ports some modular computer stuff from baystation
 2022-07-03 17:04:54 -07:00
Razgriz
f46bacf1da Merge pull request #4454 from CHOMPStation2/upstream-merge-13207 
[MIRROR] Fixes some reagent dispenser fuckery
 2022-07-03 17:03:14 -07:00
Casey
3eda7b5ba6 That nice glow 2022-07-03 23:56:32 +00:00
Razgriz
f7fb2e7ca9 powder that makes you say yes 2022-07-03 16:50:16 -07:00
Razgriz
063f1cf3aa powder that makes you say yes 2022-07-03 16:48:28 -07:00
Casey
386bb64824 Merge pull request #13264 from Very-Soft/fairylights 
Fairy lights
 2022-07-03 20:00:24 +00:00
Casey
519acf4eda Merge pull request #13221 from liache/DeadPressurePatch 
Reduces Post-Morten Pressure Damage
 2022-07-03 16:17:42 +00:00
Casey
ca0f246e59 Merge pull request #13261 from Verkister/patch-115 
Fixes a runtime preventing mob deletion
 2022-07-03 16:15:30 +00:00
Verkister
9522e76953 Fixes runtime that breaks vorepanel. 
Sanity check to prevent a bug that has permanently bluescreened a mob's vorepanel twice this week.
 2022-07-03 17:31:50 +03:00
Casey
0569f6bc99 Merge pull request #13257 from Heroman3003/produce-persist 
Fixes produce persistance
 2022-07-03 09:10:42 +00:00
Casey
ab24ba2e01 Merge pull request #13256 from Heroman3003/pai-permit-sign 
Allows pAIs to use signlang
 2022-07-03 09:09:31 +00:00
Casey
b75a3a872c Merge pull request #13250 from Heroman3003/catslug-block 
Makes AI catslugs unable to access-locked doors
 2022-07-03 09:08:24 +00:00
Casey
92d8d0f432 Merge pull request #13254 from Heroman3003/smesfix 
Fixes smes not connecting to powernet on construction
 2022-07-03 09:08:15 +00:00
Casey
987c27542b Merge pull request #13230 from Heroman3003/analyzer-jank-fix 
Makes artifact analyser prioritize artifacts
 2022-07-02 05:09:39 +00:00
Novacat
35ed936ca4 Merge pull request #13238 from Very-Soft/trasheatertweak 
Trash eater tweak
 2022-07-02 03:34:35 +00:00
Novacat
ca88e6c9fc Merge pull request #13237 from Heroman3003/setupfix 
Fixes character setup failing to update species icons
 2022-07-02 02:03:48 +00:00
TheGreatKitsune
829ac09552 Add section for Ghost roles to the Antag tab 2022-07-01 20:30:53 -05:00
TheGreatKitsune
fc499d28f1 All hands announce respects silent admin spawn 2022-07-01 19:26:11 -05:00
Novacat
d13deeeac6 Merge pull request #13229 from Heroman3003/multiline-ooc-notes 
Makes 'set ooc notes' use multiline textbox
 2022-07-01 21:26:33 +00:00
Novacat
c6118ebf0b Makes gateway-spawned solargrubs not tracked by solargrub event 2022-07-01 21:26:25 +00:00
Novacat
e4faf3d95f Merge pull request #13223 from Heroman3003/lightning-nerf 
Reduces range of lightning strike zaps to 1
 2022-07-01 21:25:18 +00:00
Novacat
ecf195e93d Merge pull request #13228 from Heroman3003/unbucket 
Removes wooden bucket recipe from planks
 2022-07-01 21:25:10 +00:00
Novacat
91db3eba3b Merge pull request #13236 from Heroman3003/bloodmoon-fix 
Fixes blood moon transition breaking weather system
 2022-07-01 21:23:59 +00:00
Casey
e1edec79c8 Ports some modular computer stuff from baystation 2022-07-01 03:58:58 +00:00
Casey
7d189b8710 Merge pull request #13219 from Very-Soft/lightningtweak 
Lighting adjust
 2022-06-30 23:00:01 +00:00
Casey
84e6bfd922 Makes all things that check for dorms check for forbid events var 2022-06-30 22:59:57 +00:00