cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-25 08:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,085 Commits 9 Branches 0 Tags
05653f2febf61e976dc10d45ba54bc1932eb598b
Commit Graph

2432 Commits

Author SHA1 Message Date
Razgriz
d96f69c28d Fix maint pred cancellation 
The cancel button and corner X would just randomize the fucker. I fixed it. Now it actually cancels and resets itself. I will eat your face.
 2022-04-13 23:40:01 -07:00
Casey
0a447ad26f Merge pull request #12698 from FartMaster69420/xenobio-upgrades-clean 
Xenobio Upgrades
 2022-04-11 19:24:32 +00:00
Casey
97eccd40fa Merge pull request #12659 from Very-Soft/tweaks 
Adjusts trees and vendor spawners
 2022-04-06 00:56:29 +00:00
Nadyr
a121954e24 Merge pull request #3992 from CHOMPStation2/upstream-merge-12592 
[MIRROR] The Grand /TG Port - Part 6
 2022-04-04 17:52:53 -04:00
Nadyr
6fe5e8c1e1 Merge pull request #3991 from CHOMPStation2/upstream-merge-12579 
[MIRROR] The Grand /TG Port - Part 5
 2022-04-04 17:37:57 -04:00
Nadyr
d34ba3d49f Merge pull request #3990 from CHOMPStation2/upstream-merge-12578 
[MIRROR] The Grand /TG Port - Part 4
 2022-04-04 17:36:23 -04:00
Nadyr
1d62127841 Merge pull request #3989 from CHOMPStation2/upstream-merge-12577 
[MIRROR] The Grand /TG Port - Part 3
 2022-04-04 17:32:51 -04:00
Casey
de0be34c99 The Grand /TG Port - Part 6 2022-04-03 03:32:03 +00:00
Casey
60b1eeff99 Merge pull request #12579 from GhostActual/tg-port-5 
The Grand /TG Port - Part 5
 2022-04-03 03:30:56 +00:00
Casey
5c33d6ea19 Merge pull request #12578 from GhostActual/tg-port-4 
The Grand /TG Port - Part 4
 2022-04-03 03:29:50 +00:00
Casey
3ea4c8b9ea Merge pull request #12577 from GhostActual/tg-port-3 
The Grand /TG Port - Part 3
 2022-04-03 03:28:43 +00:00
Casey
d552e834a1 The Grand /TG Port - Part 2 2022-04-03 03:27:36 +00:00
Razgriz
390bca0ec1 powder that makes you say yes 2022-03-27 00:18:25 -07:00
Casey
51bd77e5c2 Firearms 1 2022-03-26 03:56:42 +00:00
Verkister
b5b4678908 Earlyports catwalk noise fix 
Fixes catwalks making footstep sounds on literally anything that crosses them, including ghosts and projectiles and everything else that definitely shouldn't be making footsteps.
 2022-03-24 21:17:58 +02:00
Nadyr
6cecc1762a powder that makes you say yes 2022-03-20 18:52:03 -04:00
Casey
8e0552a788 Colts, Revolvers, and Tasers 2022-03-20 03:10:23 +00:00
Razgriz
9b51a9f978 Merge pull request #3690 from harry3124/Yuliy-Gateway-Snowfield_1 
Re-opening Gateway/Snowfield Update
 2022-03-18 18:45:20 -07:00
Casey
de6e5c4932 Merge pull request #12382 from BonniePandora/Atmosia-Improvements 
Minor Atmos-tech QoL & new hazard vest
 2022-03-07 08:36:25 +00:00
Casey
80f5298a18 Ammo Boxes 2022-03-03 21:23:43 +00:00
Casey
68c0ed10a7 Merge pull request #12356 from Very-Soft/persistchange 
Change painting persist decay
 2022-03-02 06:08:02 +00:00
Casey
0eaeb0f368 THERE WILL BE BLOOD. SHED. 2022-02-26 09:12:15 +00:00
Nadyr
59090266bd Merge pull request #3717 from CHOMPStation2/upstream-merge-12286 
[MIRROR] Merge Fixes for 8222
 2022-02-19 20:51:16 -05:00
Nadyr
23f9e5828b Merge pull request #3701 from CHOMPStation2/upstream-merge-12247 
[MIRROR] Fixes sofa paths
 2022-02-19 20:34:07 -05:00
Nadyr
3fe87a33ed Merge pull request #3711 from CHOMPStation2/upstream-merge-12253 
[MIRROR] Donk Co. Toys
 2022-02-19 19:55:19 -05:00
Nadyr
97cf4ce634 Merge pull request #3681 from CHOMPStation2/upstream-merge-12233 
[MIRROR] Heavy-duty Engineer's Gloves
 2022-02-19 18:15:45 -05:00
Casey
592777ba9b Merge Fixes for 8222 2022-02-19 22:04:54 +00:00
Casey
3d6510f3ea Donk Co. Toys 2022-02-19 04:27:50 +00:00
Casey
8bfa8b09ab Fixes sofa paths 2022-02-18 19:05:41 +00:00
Razgriz
b0282d8d1b Merge pull request #3693 from CHOMPStation2/upstream-merge-12256 
[MIRROR] Sizegun Revamp 2022
 2022-02-17 17:38:01 -07:00
Casey
9b6517106b Merge pull request #12256 from GhostActual/sizegun-revamp-2022 
Sizegun Revamp 2022
 2022-02-17 20:32:45 +00:00
BlackMajor
f673cf2261 fixed some stuff. Not all of it yet. 2022-02-17 23:55:34 +13:00
harry3124
c99270b5b1 Re-opening Gateway/Snowfield Update 
All previous work progress lost, simply re-opening from

https://github.com/CHOMPStation2/CHOMPStation2/pull/3288#issue-1073079856
 2022-02-17 14:06:25 +09:00
Casey
c3a0eaaf5b Merge pull request #12242 from GhostActual/bigshot_glasses 
Now's your chance to be a [BIG SHOT]
 2022-02-16 07:21:13 +00:00
Casey
e723ed2118 Heavy-duty Engineer's Gloves 2022-02-14 21:32:19 +00:00
Verkister
86e18daa98 Update watercloset_vr.dm 2022-02-10 14:24:01 +02:00
Verkister
8f1bac9cdc Couple more flush tweaks. 
Fixes an oversight of picking up or moving contents off the tile mid-animation not saving them from getting flushed.
Also makes it possible to flush small (unbuckled and knocked down) mobs up to 75% size :v
 2022-02-10 14:20:56 +02:00
Verkister
15c9d5973a Instead of instantly just zapping the contents away, they now swirl the stuff around before making it vanish one item at a time, keeping the things contained for a 20 sec cooldown time before it gets zapped to the exit landmark, this serving as both, spam protection and a chance for the possible player victim to watch the action finish before they're bluespaced away. 
Also makes the exit landmark use a new contained item retrieval system instead of just making a messy lagpile in the open. The machine also processes down certain things, these icluding foods, organs, and vore eggs, making the thing not be useful as a food vendor for your dear enemies, and popping open vore eggs so that nobody needs to end up blindly guessing mystery contents. Also the machine has a funny little feature to get rid of the unwanted contents as well. (SPOILERS: it's a "Muffin Monster" mode with a twist. The monster is an actual voremob contained within the machine, and if active, the contents will end up in its gut. Deactivating will release the contents back into the machine. Sounds like some sorta Bethesda level brainfart, right? But I did it on purpose for another even funnier feature: Emagging the machine while the mode is active will release the monster as a hostile mob lmao)

Not even gonna bother marking as chompedit for now cause it was already all my code and I doubt anyone else up there's gonna be touching the file and might just end up porting it there anyway if I somehow get a charitable urge to provide them with non-critical funfeatures again :v
 2022-02-07 21:38:55 +02:00
Nadyr
33403c6445 Merge branch 'master' into upstream-merge-12164 2022-02-06 21:38:32 -05:00
Nadyr
03bae00061 Merge pull request #3616 from CHOMPStation2/upstream-merge-12151 
[MIRROR] adds a catslug crate to cargo
 2022-02-06 20:40:53 -05:00
Nadyr
4efce5f15f Merge pull request #3615 from CHOMPStation2/upstream-merge-12146 
[MIRROR] skimpy cap "dress" probably more like a leotard idk
 2022-02-06 20:36:30 -05:00
Casey
80e943716f talon miner 2022-02-06 23:21:47 +00:00
Casey
b77383ecce Merge pull request #12151 from PastelPrinceDan/catslugcrate 
adds a catslug crate to cargo
 2022-02-06 14:16:18 +00:00
Casey
86ca5e5d49 Merge pull request #12146 from Hatterhat/formal-in-the-loosest-sense 
skimpy cap "dress" probably more like a leotard idk
 2022-02-06 14:15:06 +00:00
Casey
7f3da20187 Talon Improvements, Take 2 2022-02-06 14:07:23 +00:00
Nadyr
656b477d19 Merge pull request #3203 from BlackMajor/cit-mobs 
Porting a hefty chunk of Citadel mobs.
 2022-01-29 17:09:18 -05:00
Novacat
6993d13559 Merge pull request #12080 from Heroman3003/lowall 
Fixes wrench dropping when deconstructing low wall + allows normal climbing
 2022-01-22 14:19:06 +00:00
Casey
9460986025 Merge pull request #12061 from Very-Soft/spoilers 
Removes the announcement for main pred and morph spawns
 2022-01-14 18:45:25 +00:00
Casey
e3e993aed6 Merge pull request #12030 from Heroman3003/artfix 
Adjusts descriptions and flavor texts of painting frames
 2022-01-09 01:50:51 +00:00
BlackMajor
6b4ccac9db many more fixes 2021-12-14 02:22:21 +13:00