cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 05:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,837 Commits 7 Branches 0 Tags
6b0b2efbfb51f03a07b80b93cf4e4aeffe9e8ad6
Commit Graph

20815 Commits

Author SHA1 Message Date
Raeschen
6ec26808d5 Merge pull request #6485 from CHOMPStation2/upstream-merge-15099 
[MIRROR] A variety of miscellaneous bugfixes
 2023-07-02 15:45:15 +02:00
Raeschen
871c0f5425 Merge pull request #6483 from CHOMPStation2/upstream-merge-15098 
[MIRROR] Randomness updates
 2023-07-02 15:45:09 +02:00
Raeschen
9223d398ba Merge pull request #6482 from CHOMPStation2/upstream-merge-15097 
[MIRROR] Moves BL-3/P design to correct folder
 2023-07-02 15:45:02 +02:00
Raeschen
21696f053c Update mechfab_designs_vr.dm - forgot a comment block end tag 2023-07-02 15:41:41 +02:00
Raeschen
52961b6db0 Update mechfab_designs_vr.dm merge conflict 2023-07-02 15:40:43 +02:00
Heroman3003
9926ef6647 Merge pull request #15099 from Heroman3003/misc-fixes 
A variety of miscellaneous bugfixes
 2023-07-01 23:33:38 +00:00
TheGreatKitsune
25048b7463 Fix shadekin dark hideout and a few other changes to it 2023-07-01 17:31:07 -05:00
Casey
4cefffe8f4 Merge pull request #15098 from Very-Soft/redgate 
Randomness updates
 2023-07-01 22:31:02 +00:00
Heroman3003
879a1d4610 Moves BL-3/P design to correct folder 2023-07-01 21:48:57 +00:00
Raeschen
ed75318989 Merge pull request #6471 from tacoguy7765093/nuclear-and-wild 
Modernizes the nuke code
 2023-07-01 09:31:26 +02:00
Heroman3003
48926a6afb Merge pull request #15091 from Runa-Dacino/ghostpodstuff 
Fixes and tweaks "Survivor Pods"
 2023-06-28 21:34:39 +00:00
Bib Bob
957a48409e red instead of blue 2023-06-27 22:33:27 -05:00
Bib Bob
08abcd3f33 modernizes the nuke code 2023-06-27 22:13:47 -05: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
Raeschen
e048b3a314 Fixes several missing texture objects 2023-06-25 15:38:45 +02:00
Raeschen
94c59cf604 Merge pull request #6446 from CHOMPStation2/upstream-merge-15070 
[MIRROR] Adds some altevian-themed props
 2023-06-25 12:40:00 +02:00
Aroliacue
9f44f1da93 Spiderweb/Cocoon Health Reduction 2023-06-24 17:02:44 +10: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
1189075bc3 fix merge conflicts 2023-06-22 10:45:56 +02:00
Heroman3003
29ca579ab8 Implements Climbing 2023-06-21 19:22:02 +00:00
Raeschen
ef98e7f4ea Fix a few chomp-specific typepaths and a marge conflict 2023-06-21 08:26:10 +02:00
FluffMedic
2a43353d18 Merge branch 'master' into craft 2023-06-20 15:26:56 -04:00
Raeschen
8e0238bfc5 Merge pull request #6369 from ItsSelis/db-mentors 
Adding DB Capability for Mentors
 2023-06-20 08:04:42 +02:00
Selis
241776a181 Merge remote-tracking branch 'CHOMPStation2/upstream-merge-15023' into big-new-tgui-pr 2023-06-19 18:33:33 +02:00
Raeschen
9ae31e501e Merge pull request #6411 from CHOMPStation2/upstream-merge-15043 
[MIRROR] Spell Fixes
 2023-06-19 12:42:37 +02:00
Raeschen
74765cf864 fix merge conflicts 2023-06-19 12:32:36 +02:00
Raeschen
b3b2b9ce80 Merge pull request #6403 from CHOMPStation2/upstream-merge-15040 
[MIRROR] New Belts and Accessories
 2023-06-19 11:19:01 +02:00
Raeschen
64558e6f77 Merge pull request #6391 from CHOMPStation2/upstream-merge-15022 
[MIRROR] Forbidden Tuna
 2023-06-19 11:10:10 +02:00
Raeschen
8bc7957b81 Merge pull request #6280 from Seris02/diagonalmovement 
proper diagonal movement
 2023-06-19 09:09:31 +02:00
Raeschen
6bd26e380d Merge pull request #6265 from purplefoxy27/in-shoe-steppies 
Add inshoe steppies
 2023-06-19 09:08:59 +02:00
Heroman3003
db38ed93c0 Spell Fixes 2023-06-19 04:40:45 +00:00
Heroman3003
e5bb9e586e Merge pull request #15040 from Youtubeboy139/Belts-And-Stuff 
New Belts and Accessories
 2023-06-18 18:42:07 +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
1f99e6ce53 Merge pull request #6329 from CHOMPStation2/upstream-merge-14976 
[MIRROR] More 515 Compatibility
 2023-06-18 14:59:19 +02:00
Raeschen
bddb482da1 Merge pull request #6353 from CHOMPStation2/upstream-merge-14995 
[MIRROR] Store your suits and borgs more properly
 2023-06-17 23:30:15 +02:00
Raeschen
3a8f28c2c5 Merge pull request #6351 from CHOMPStation2/upstream-merge-14961 
[MIRROR] "Hey bud, need a light?"
 2023-06-17 23:09:05 +02:00
Raeschen
2c5bcc45e0 Merge pull request #6349 from CHOMPStation2/upstream-merge-14941 
[MIRROR] Time to cool off
 2023-06-17 23:03:32 +02:00
Raeschen
22f6c33c84 Merge pull request #6336 from ItsSelis/selis-runtime-fixes 
A few nullchecks
 2023-06-17 22:54:57 +02:00
Raeschen
30f2a668f4 Merge pull request #6337 from CHOMPStation2/upstream-merge-14988 
[MIRROR] Fixes oversight of picnic blankets NOT being anchored
 2023-06-17 22:53:58 +02:00
Digi Purpur
47d6a439f1 All the changes required for coilgun FXs to work 
Changes object/effects from "pointdefense" to "coildefense" to use when you prefer "projectile" PD turrets (point defense turrets vars and such should just use the old laser effects for cases where we wanna use those instead of the new ones Rykka and I added here!)
 2023-06-17 09:04:05 -07:00
Raeschen
52e19d9bd6 Merge pull request #6315 from CHOMPStation2/upstream-merge-14725 
[MIRROR] [MIRROR] Fixing Tape Recorder Voices
 2023-06-17 15:18:31 +02:00
Raeschen
1cee2272d6 fix merge conflict 2023-06-17 15:14:02 +02:00
Raeschen
7c5f1f6049 Merge pull request #6314 from CHOMPStation2/upstream-merge-14957 
[MIRROR] Fixes #14956
 2023-06-17 15:12:04 +02:00
Raeschen
2c3eefe326 Merge branch 'master' into upstream-merge-14976 2023-06-17 14:47:37 +02:00
Heroman3003
2313a67318 Merge pull request #15022 from Youtubeboy139/Landmines 
Forbidden Tuna
 2023-06-17 06:36:11 +00:00
Razgriz
4361f83fb2 Merge pull request #6380 from CHOMPStation2/upstream-merge-15029 
[MIRROR] feature: Adds admin logging to disposals incidents
 2023-06-16 11:38:36 -07:00
Selis
014e851218 CHOMPedit Comment 2023-06-16 18:24:54 +02:00
Selis
d8773879c6 Adds tracy integration 2023-06-16 18:20:56 +02:00
Heroman3003
5a2b7dd32c Merge pull request #15029 from Runa-Dacino/disposals 
feature: Adds admin logging to disposals incidents
 2023-06-16 06:30:29 +00:00