cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,400 Commits 9 Branches 0 Tags
16c26386ce2e88e4f600fa07f20c79b8c461f47f
Commit Graph

471 Commits

Author SHA1 Message Date
Eli
16c26386ce Merge remote-tracking branch 'upstream/master' into belly-feedable 2023-04-24 21:09:20 +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
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
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
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
Sharkmare
df2d7f67e6 closing html tags 2023-04-13 14:33:03 +02:00
Sharkmare
36d7772d67 Malf Drone POI support 
Add support for POI
 2023-04-13 14:28:53 +02:00
Sharkmare
db980c6f1d Further restructuring 2023-04-13 12:29:58 +02:00
Sharkmare
74b30d0157 Clarify bitwise inverter for compiler 2023-04-13 12:00:15 +02:00
Sharkmare
5ad4e7eb17 Forgot DC doesnt like relative paths 2023-04-13 11:56:10 +02:00
Sharkmare
f1330a3ebd Move drones to modular + changes 
Moves drones into the modular folder to allow for more violent changes without having to worry about upstreams potentially adding something to regular drones.

Restructures some of drone code a bit to be nicer in my oppinion

Still needs a second pass at some point but hey if you never start
 2023-04-13 11:48:05 +02:00
Verkister
5471c551d8 Merge branch 'master' into garbobutton 2023-04-11 14:13:07 +03:00
Nadyr
9e11644564 Merge pull request #6054 from Verkister/patch-48 
Fixes a grinder bug with "anchored" trash contents
 2023-04-11 00:53:35 -04:00
Nadyr
45e1fbd0c5 Merge pull request #5924 from TheGreatKitsune/loadout-crystals 
Adds loadout capture crystals!
 2023-04-10 17:13:47 -04:00
Verkister
5024b2977c Couple more recycling tweaks 
Added a button for garbage grinder that can be pressed without needing to open the windoor.
Fixed AI/borg interaction with the grinder.
Added a var to toggle the recycling crusher's manual feeding, which the grinder will toggle off for it. (borg modules will no longer be eaten out of their slots)
Made the crusher start upgraded to full efficiency.
Also fixed the funned up poster near the entrance.
 2023-04-10 12:26:30 +03:00
Verkister
61ff2abe6d Fixes a grinder bug with "anchored" trash contents 
Not sure how many other random items might have "anchored" items inside them, but bullet casings are definitely one of those, containing anchored projectiles that would linger on the tile, ready to magdump themselves into the next unlucky person to step in.
 2023-04-08 13:20:06 +03:00
Nadyr
622ab367a3 Merge pull request #6028 from TheGreatKitsune/Off-manifest-play 
Buff Outsider positions, remove station autosleever ghost spawns
 2023-04-06 18:34:14 -04:00
Nadyr
9d93a3c1bb Merge pull request #6044 from Verkister/patch-43 
Fixes swoopie neck speed again.
 2023-04-06 18:15:45 -04:00
Verkister
6c42b233f2 material from crates/lockers 2023-04-06 19:25:54 +03:00
Verkister
01b9fc6e18 Update swoopie.dm 2023-04-06 15:56:40 +03:00
Verkister
b5e1d766a7 Fixes swoopie neck speed again. 
Gonna have to look a bit deeper into this pesky vorepanel order bug.
 2023-04-06 15:00:40 +03:00
Verkister
fbf6c88f42 small runtime fixy and sorter buff 2023-04-06 02:03:18 +03:00
Verkister
c9bff65518 big brain moment 2023-04-05 23:48:49 +03:00
Verkister
c39f2fc63b Adds item digestion blacklist and crowbar access hatch to release blacklisted stuff 2023-04-05 23:38:46 +03:00
Verkister
62d3101d89 act 2023-04-05 22:27:11 +03:00
Verkister
f46b665c8c Radio alert 2023-04-05 21:26:22 +03:00
Verkister
12941200d0 Emaggable safety feature 2023-04-05 21:16:13 +03:00
Verkister
b9153059e7 Makes recycling more exciting 
And much more dangerous with a new kind of garbage mulcher that basically takes in pretty much any item, even crates/lockers, and chews it the fun up, popping all its contents out to be swallowed next, ensuring everything within gets also recycled for optimal efficiency. Also applies oofy brute grinds on mobs and gibs dead bodies, slurping up the gibs and splatters right after. Complete with animations and noises asset remixed out of laziness to a decent enough result.

Originally envisioned overhauling the entire recycling system, but kinda got lazy and ended up just making the new piece an addon to utilize the existing system for further processing.

Also added an adjustable var for disposal outlets to determine the range of the stuff it shoots out, and made the one at disposal chute launch only 1 tile, no longer blasting it all directly into the windoor with fat sound/message spam.
 2023-04-05 20:39:12 +03:00
Verkister
0cc072a8fd Fixes swoopie neck transfer speed 
Was originally set a bit too long due to a vorgan order bug that appeared in the old test runs and was tweaked out before release
 2023-04-05 07:47:48 +03:00
Verkister
b92fb9222a Fixes a funny gargoyle feeding bug 
Fixes borgo tongues giving feedable gargoyles a little bit too deep cleansing.
 2023-04-03 15:31:54 +03:00
TheGreatKitsune
83dcbb29a8 Buff Outsider positions, remove station autosleever ghost spawns 2023-04-02 18:39:49 -05:00
Nadyr
0cac272b30 Merge pull request #6016 from FluffMedic/CultAdjust 
Fixing File Pathing
 2023-04-02 19:31:40 -04:00
Nadyr
dd5030f0dc Merge pull request #6017 from Verkister/patch-39 
Unhardens flush message code
 2023-04-02 19:31:07 -04:00
Nadyr
5f504b2c2f Merge pull request #6013 from TheGreatKitsune/vox-clothing-fix 
Restore some vox clothing that was lost [FIXES #5992]
 2023-04-02 19:30:05 -04:00
Nadyr
04d3f4c669 Merge pull request #6012 from Verkister/stonebins 
Feedable gargoyles
 2023-04-02 19:29:42 -04:00
Verkister
1637bb6527 Unhardens flush message code 
Makes it possible to varedit utilize a toilet into a non-toilet use without awkwardly revealing messages.
 2023-04-02 16:15:55 +03:00
Fluff
c276482f77 Fixing File Pathing 
Something was invisible because of incorrect file pathing. Fixed that.
 2023-04-02 08:45:43 -04:00
Razgriz
ee54791e47 Merge pull request #6001 from Rykka-Stormheart/shep-dev-spec-fix-2 
Species Sounds Hotfix 2
 2023-04-01 18:59:39 -07:00
TheGreatKitsune
3f3816ddb4 Restore some vox clothing that was lost 2023-04-01 13:10:26 -05:00