cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-27 07:08:55 +01:00
Code Issues Packages Projects Releases Wiki Activity
84,675 Commits 10 Branches 0 Tags
master
Commit Graph
2908 Commits
Author SHA1 Message Date
NadyrandGitHub 3fe87a33ed Merge pull request #3711 from CHOMPStation2/upstream-merge-12253 
[MIRROR] Donk Co. Toys
 2022-02-19 19:55:19 -05:00
NadyrandGitHub 97cf4ce634 Merge pull request #3681 from CHOMPStation2/upstream-merge-12233 
[MIRROR] Heavy-duty Engineer's Gloves
 2022-02-19 18:15:45 -05:00
CaseyandCHOMPStation2 592777ba9b Merge Fixes for 8222 2022-02-19 22:04:54 +00:00
CaseyandCHOMPStation2 3d6510f3ea Donk Co. Toys 2022-02-19 04:27:50 +00:00
CaseyandCHOMPStation2 8bfa8b09ab Fixes sofa paths 2022-02-18 19:05:41 +00:00
RazgrizandGitHub b0282d8d1b Merge pull request #3693 from CHOMPStation2/upstream-merge-12256 
[MIRROR] Sizegun Revamp 2022
 2022-02-17 17:38:01 -07:00
CaseyandCHOMPStation2 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
CaseyandCHOMPStation2 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
CaseyandCHOMPStation2 e723ed2118 Heavy-duty Engineer's Gloves 2022-02-14 21:32:19 +00:00
VerkisterandGitHub 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
NadyrandGitHub 33403c6445 Merge branch 'master' into upstream-merge-12164 2022-02-06 21:38:32 -05:00
NadyrandGitHub 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
NadyrandGitHub 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
CaseyandCHOMPStation2 80e943716f talon miner 2022-02-06 23:21:47 +00:00
CaseyandCHOMPStation2 b77383ecce Merge pull request #12151 from PastelPrinceDan/catslugcrate 
adds a catslug crate to cargo
 2022-02-06 14:16:18 +00:00
CaseyandCHOMPStation2 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
CaseyandCHOMPStation2 7f3da20187 Talon Improvements, Take 2 2022-02-06 14:07:23 +00:00
NadyrandGitHub 656b477d19 Merge pull request #3203 from BlackMajor/cit-mobs 
Porting a hefty chunk of Citadel mobs.
 2022-01-29 17:09:18 -05:00
NovacatandCHOMPStation2 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
CaseyandCHOMPStation2 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
CaseyandCHOMPStation2 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
NadyrandGitHub 970000bbc4 Merge pull request #3486 from CHOMPStation2/upstream-merge-12004 
[MIRROR] Limits painting name length to 250 characters
 2021-12-12 06:44:23 -05:00
NadyrandGitHub 1141e96505 Merge pull request #3295 from CHOMPStation2/upstream-merge-11975 
[MIRROR] Door Interact Tweaks
 2021-12-12 06:28:53 -05:00
NadyrandGitHub dfdf720ee9 Merge pull request #3301 from CHOMPStation2/upstream-merge-11968 
[MIRROR] Allows simplemobs climb ladders + trash pile interaction fix
 2021-12-12 06:22:42 -05:00
CaseyandDarlantan 5cefa8d4e3 department berets (mostly heads tbh) 2021-12-12 04:20:38 -05:00
NadyrandGitHub bf5f98c728 Merge pull request #3427 from CHOMPStation2/upstream-merge-11815 
[MIRROR] Adds catslug to maintpred options
 2021-12-12 04:13:27 -05:00
NadyrandGitHub 62921c7b1a Merge pull request #3401 from CHOMPStation2/upstream-merge-11779 
[MIRROR] Fixes infinite glass from low walls
 2021-12-12 02:00:08 -05:00
CaseyandChompstation Bot 2c122a8822 Merge pull request #12004 from Heroman3003/paintname-limit 
Limits painting name length to 250 characters
 2021-12-11 13:55:38 +00:00
RazgrizandGitHub af8834894b powder that makes you say yes 2021-12-10 00:55:04 -07:00
CaseyandChompstation Bot 3d3fc07d0e Merge pull request #11877 from Heroman3003/glovening 
Adds leather gloves to (xeno)botanist lockers
 2021-12-10 06:12:10 +00:00
CaseyandChompstation Bot afcf943138 Adds catslug to maintpred options 2021-12-10 01:08:04 +00:00
CHOMPStation2andGitHub 8324777d6e Powder that makes you say yes 2021-12-09 14:16:10 -07:00
CaseyandChompstation Bot 2047a923b2 Merge pull request #11968 from Heroman3003/simplemob-clickfix 
Allows simplemobs climb ladders + trash pile interaction fix
 2021-12-08 04:18:02 +00:00
CaseyandChompstation Bot 90c9ef5f3f Door Interact Tweaks 2021-12-08 04:17:15 +00:00
BlackMajor dbb5a4083b more progress 2021-12-07 01:46:21 +13:00
NadyrandGitHub 1dc06fd9e6 Merge branch 'master' into upstream-merge-11928 2021-12-05 12:50:21 -05:00
NadyrandGitHub cc9fa9282c powder that makes you say yes 2021-12-05 10:53:54 -05:00
CaseyandChompstation Bot fe8c4753eb Offmap Tweaks 2021-12-03 07:14:17 +00:00
NadyrandGitHub 19246dbed1 Merge pull request #3165 from CHOMPStationBot/upstream-merge-11722 
[MIRROR] Hardwood Material Port
 2021-10-30 23:30:40 -04:00
Chompstation Bot da9e3383a8 Hardwood Material Port 2021-10-30 21:25:32 +00:00
Chompstation Bot 60de9a473c Stellar Delight! 2021-10-30 13:34:04 +00:00
NadyrandGitHub e04d6162fc Merge pull request #3095 from CHOMPStationBot/upstream-merge-11544 
[MIRROR] [MIRROR] Separates Swimsuit and Athletic Lockers, Adds Wetsuits
 2021-10-22 19:51:36 -04:00
NadyrandGitHub 024c8d1dd0 Merge pull request #3090 from CHOMPStationBot/upstream-merge-11535 
[MIRROR] Misc additions I made while sleep deprived
 2021-10-22 19:46:46 -04:00
Aronai SieyesandChompstation Bot f2702c5455 Merge pull request #11544 from VOREStation/upstream-merge-8230 
[MIRROR] Separates Swimsuit and Athletic Lockers, Adds Wetsuits
 2021-10-22 18:24:49 +00:00
Ghost ActualandChompstation Bot 91fc1bd364 Misc additions I made while sleep deprived (#11535) 
* Base Commit

* Small Fix

* Small Fix

* Small Fix
 2021-10-22 17:49:28 +00:00