cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,626 Commits 10 Branches 0 Tags
981908beec0796a30ba9a5a7ee66f91c28e85f2d
Commit Graph

514 Commits

Author SHA1 Message Date
Verkister
981908beec More modularity and miner borgo belly upgrade 2023-05-07 15:56:11 +03:00
Verkister
9467a240d5 another cancel fixy 2023-05-07 02:02:30 +03:00
Verkister
a5a4cd029b cancel fixy 2023-05-07 01:52:10 +03:00
Verkister
f623e7dd9a Fixes and sound tweaks and power indicator 2023-05-06 18:59:26 +03:00
Verkister
9369ebb4a1 missed a funny check 2023-05-06 10:07:17 +03:00
Verkister
cc37afeb0d Adds yet another funny vac feature. 
Adds a handheld/borgmodule device "Vac attachment" that can be used to clean up dirt, junk, and even mobs off the floors depending on the power settings.
Power settings go as follow, each level adding onto the previous one.
"dust and grime" - cleans only cleanable decals and floor dirt.
"tiny objects" - also sucks tiny objects, such as pens and ciggy butts etc.
"pests and small objects" - mice/lizards/roaches, micros, and pocket sized clutter.
"medium objects" - normal sized items.
"large objects" - backpack/toolbox size stuff.
"large pests" - any size mobs and crew.
Sucked up objects and mobs do a little twirl in line before ending up inside the user's selected vorgan.
 2023-05-05 20:51:35 +03:00
Eli
0fe4771c8d Merge remote-tracking branch 'upstream/master' into second-autotransfer 2023-05-01 17:32:43 +10:00
BlackMajor
c1a01015e7 Merge branch 'master' into matrices 2023-05-01 14:23:18 +12:00
Nadyr
da527f92fb Merge pull request #6132 from Fracshun/belly-feedable 
Feedable belly preference
 2023-04-30 20:50:57 -04:00
Nadyr
809871054e Merge pull request #6151 from TheGreatKitsune/Underwear-tf-fix 
Fixes undergarments getting yeeted by any belly update
 2023-04-30 20:26:28 -04:00
BlackMajor
65a5644b02 Ugh 2023-04-30 21:39:18 +12:00
Nadyr
973030bd20 Merge pull request #5706 from FluffMedic/Valley 
Wilds Expansion - The Valley
 2023-04-30 03:18:14 -04:00
BlackMajor
8730bd6b0f Merge branch 'master' into matrices 2023-04-30 16:19:43 +12:00
BlackMajor
6f9f78213d Merge branch 'master' into matrices 2023-04-30 16:14:51 +12:00
BlackMajor
e3c6d74ffd Done and dusted 2023-04-30 15:49:35 +12:00
Eli
e584ee4c46 Merge remote-tracking branch 'upstream/master' into belly-feedable 2023-04-29 20:02:42 +10:00
TheGreatKitsune
8f1df44432 Fixes undergarments getting yeeted by any belly update 2023-04-27 12:34:40 -05:00
Eli
5f4e440233 Merge remote-tracking branch 'upstream/master' into second-autotransfer 2023-04-27 17:36:41 +10:00
Aroliacue
6894e47299 Merge branch 'master' into aro_mechshoes 2023-04-26 11:57:40 +10:00
Nadyr
aea51c0df5 Merge pull request #6076 from Sharkmare/patch-33 
Keeping track of how many recyclings happaned
 2023-04-25 20:49:05 -04:00
Nadyr
daed773657 Merge pull request #6115 from Aroliacue/aro_vests 
Sec/Explo Plate Carriers in Loadout
 2023-04-25 20:48:31 -04:00
Nadyr
0ca66ff880 Merge pull request #6126 from Aroliacue/aro_wings 
Migrates All Chomp Wings to Chomp_Modular Folder
 2023-04-25 20:47:13 -04:00
Nadyr
fb6f726187 Merge pull request #6074 from Sharkmare/Flipper 
Codename Flipper
 2023-04-25 20:33:45 -04:00
Fluff
e7150e204f Fixing an eclipse mistake 
Title
 2023-04-25 16:29:49 -04:00
Kassc
5eb851264c Merge pull request #6141 from Kazzc/GrandLibrarySP 
Grand Library SP-pod
 2023-04-24 18:36:28 -04:00
Kassc
b52fc0cb48 Grand Library SP-pod 
-Shutters and button use ID:"glcafe"
Credits go to "FreaRose"
 2023-04-24 16:13:33 -04:00
Eli
16c26386ce Merge remote-tracking branch 'upstream/master' into belly-feedable 2023-04-24 21:09:20 +10:00
Eli
e821a4b42b Secondary Auto-Transfer 
Adds in a secondary location and chance for auto transfers. It required reworking the logic regarding transfer queues with min and max transfer settings. When objects transfer they will individually attempt the primary location first, and failing that it will attempt the second. If both fail the object's transfer cooldown starts again.
 2023-04-22 20:09:29 +10:00
Aroliacue
e60bb3d409 Fluff Mech Shoes 2023-04-22 13:46:28 +10:00
Eli
27ca556ee3 Feedable belly preference 
Adds a new belly specific option to disable it from appearing for others during feeding prompts.
 2023-04-20 17:46:25 +10:00
Sharkmare
61b273fea3 Merge branch 'master' into patch-33 2023-04-20 09:27:19 +02:00
Aroliacue
a15a4e9009 Migrates all Chomp Wings to Chomp_Modular folder 2023-04-20 08:50:27 +10:00
Verkister
a4278380c7 Swoopie neck fix and couple other tweaks 
Fixed "speedy" vorgans not getting removed from SSbellies processing list, and also switches those from mob subsystem to obj subsystem to reduce lag.
Optimized some mob processing as well, mainly by making simplemob carboncorpses, monkeys, brainmobs, and observers low priority processing for the mobs subsystem.
Also swapped swoopie's main gut fullscreen to a more appropriate one.
 2023-04-19 20:40:39 +03:00
Razgriz
548a61c663 Merge pull request #6096 from TheGreatKitsune/underwear-tf-vbelly 
Add Undergarment TF mode to vore sprites.
 2023-04-18 06:45:53 -07:00
Razgriz
95efc4747a Merge pull request #6092 from LpSuchtie/master 
Add the new capture crystal to the "Bits and Bobs" vendor.
 2023-04-18 06:37:55 -07:00
Aroliacue
086c8f5ae8 added detective and pilot to allowed list 2023-04-18 14:16:55 +10:00
Aroliacue
9fa7720b4c Unarmored Plate Carriers in Loadout 2023-04-18 14:08:39 +10:00
Victor Zisthus
34864100f8 scrunch 2023-04-17 13:19:58 -04:00
Victor Zisthus
4ceebe0e65 squish 2023-04-17 13:17:02 -04:00
Victor Zisthus
336647d286 Squash 2023-04-17 13:12:09 -04:00
Victor Zisthus
2f938df6c9 Actually unifies the Unified Drone Fabricator. 
Poor mining drone was forgotten. NO MORE! This re-adds them to the list for the unified style Dronefab.
 2023-04-17 02:02:47 -04:00
Fluff
b721543010 Added some decor. 
Added some decoration
 2023-04-16 08:38:17 -04:00
Verkister
01ed70c6f1 Fixes trash grinder initialize linkage 
Ironic that the thing broke because i removed a "break" haha
 2023-04-16 10:54:18 +03:00
Nadyr
f1ba830893 Merge pull request #6093 from kcin2001/bug-tweaks 
add new sect drone wing and head only tyranid marking
 2023-04-16 00:23:34 -04:00
Nadyr
c19fc71b85 Merge pull request #6080 from Sharkmare/Drone-Ref 
Drone code restructure
 2023-04-16 00:02:11 -04:00
Nadyr
9d53565799 Merge pull request #6072 from Verkister/garbobutton 
Couple more recycling tweaks
 2023-04-15 21:11:23 -04:00
Nadyr
dadae51b1d Merge pull request #6000 from FluffMedic/BehemothRework 
Behemoth Rework and Loot
 2023-04-15 20:40:24 -04:00
TheGreatKitsune
e38ee2a935 Add Undergarment TF mode to vore sprites. 2023-04-14 19:13:59 -05:00
kcin2001
8adc18249d add new sect drone wing and head only tyranid marking 2023-04-14 12:53:35 -07:00
LukasJuergens
0efee21dc6 Add the new capture crystal to the "Bits and Bobs" vendor. 
Also fixed a typo in the crystals description.
 2023-04-14 18:35:54 +02:00