Commit Graph

9534 Commits

Author SHA1 Message Date
Kassc
37b11354a8 Merge pull request #6153 from FluffMedic/INeedSleep
Fixing some minor things #Lizzard
2023-04-30 20:30:11 -04:00
Nadyr
973030bd20 Merge pull request #5706 from FluffMedic/Valley
Wilds Expansion - The Valley
2023-04-30 03:18:14 -04:00
BlackMajor
e3c6d74ffd Done and dusted 2023-04-30 15:49:35 +12:00
BlackMajor
05e2a55843 test 2023-04-30 14:29:11 +12:00
Fluff
0fb37f5088 Fixing some minor things #Lizzard
Removed the double toilet in in the 3rd deck giant bathroom. As in the two toilets in the same space.
Swapped the escape pod nanomeds for emergency medical wall lockers, because of the malfunction machine event.

And removed the random space tile in restaurationbar.
2023-04-28 13:57:20 -04:00
Kassc
fdf7d783ee Merge pull request #6011 from FoxglovePurpur/purdevmapping
Library Cafe Changes
2023-04-25 22:25:06 -04:00
Heroman3003
d85bf59b5e One-way conveyor switches 2023-04-20 06:14:54 +00:00
Razgriz
4e89b8eff9 Merge pull request #6114 from FluffMedic/BrokenStation
Fixed double cyborg charger
2023-04-18 06:45:13 -07:00
Fluff
2215977e3c Adding a fix to the HoS's open door button
Adding a fix to the HoS's open door button to this PR too.
2023-04-17 21:34:30 -04:00
Fluff
2d24802dd4 Fixed double cyborg charger
Fixes the double cyborg charger.
2023-04-17 21:01:53 -04:00
Nadyr
ba025f9d8d Merge pull request #6111 from FluffMedic/BrokenStation
Fixing non-functioning emergency shutters
2023-04-16 21:22:42 -04:00
Fluff
6088c8e887 Fixing this random emergency shutters that didn't function
There was a row of emergency shutters that wouldn't function properly, mostly because there wasn't a complete line. Will close if this is intended.
2023-04-16 18:48:20 -04:00
Fluff
b721543010 Added some decor.
Added some decoration
2023-04-16 08:38:17 -04:00
Nadyr
9d53565799 Merge pull request #6072 from Verkister/garbobutton
Couple more recycling tweaks
2023-04-15 21:11:23 -04:00
Fluff
c135cd0678 Fixing Dorm 2 Lights
Adds a light switch to dorms 2.
2023-04-11 18:20:52 -04:00
Verkister
5471c551d8 Merge branch 'master' into garbobutton 2023-04-11 14:13:07 +03:00
Fluff
0127daaf29 Fixes
Fixed whatever this was.
2023-04-10 22:28:37 -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
Fluff
c35e308491 Eclipsed Nerf
Nerfed the eclipse
2023-04-08 21:37:49 -04:00
Bib Bob
7ee325f0e7 oops one period 2023-04-08 15:35:42 -05:00
Bib Bob
5736e64ad2 VR improvments
-The alien lab (End of the mini dungeon) now has a button that will grant access to a fast travel portal there once cleared
-Updated material stacks in sci ship to give 50 instead of 1
-Sci ship now has a vendor with prosthetic designs/implants inside it to experiment with.
-Fixes leather stack spawning atop of the Armors-R-Us
-Armor vendor has tools and buckets to allow you to trim custom armor, indirectly teaches players how to make custom armor
-t5 components and bsrped given to 3 spawnpoints
-Lighting fixes
-Fireplace is no longer dense
-Some Yellow slime cores at the mediguns
2023-04-08 15:18:12 -05: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
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
Fluff
1e7286acab Added more lights, reduced pyro mice, and changed xenobio POI
Title
2023-04-05 11:15:21 -04:00
Verkister
284059dd9c Spring cleaning
Removes all the missed miniature christmas trees on z3 and z5
2023-04-04 15:19:38 +03:00
Nadyr
cb7e20423d Merge pull request #6022 from CHOMPStation2/upstream-merge-14747
[MIRROR] More space creature events
2023-04-02 20:05:04 -04:00
TheGreatKitsune
83dcbb29a8 Buff Outsider positions, remove station autosleever ghost spawns 2023-04-02 18:39:49 -05:00
Heroman3003
a4072d405e More space creature events 2023-04-02 20:23:37 +00:00
Heroman3003
7ea6b2ce9e Makes the tether trash rat into real boy/girl/creature 2023-04-02 20:23:20 +00:00
Fluff
81c4353860 Squish Update
Updating the xenobio POI
2023-04-02 10:06:08 -04:00
Fluff
7871bc8d1a More loot alteration
Removed OP suit
Added more worth to the manor
2023-04-02 09:36:55 -04:00
TheGreatKitsune
ec3cd00518 Merge master into shadekin-dark-tunneling 2023-04-01 09:24:41 -05:00
Nadyr
9ea10c8f6e Merge pull request #5981 from CHOMPStation2/upstream-merge-14720
[MIRROR] Speed and stuff
2023-03-31 18:50:30 -04:00
Digi Purpur
48270a1b70 Cafe Rag
Adding a rag to the cafe cuz it fits for roleplay n' stuff
2023-03-31 15:24:03 -07:00
Digi Purpur
d48ac10a0a Librarian Cafe Access
Read the title :)
2023-03-31 14:39:04 -07:00
Fluff
be089d74c0 Fixed an exploit
fixes exploitation
2023-03-23 11:12:49 -04:00
Seris02
cbac088889 add to map 2023-03-23 16:46:21 +08:00
Casey
1138ab35fe Speed and stuff 2023-03-21 21:50:18 +00:00
Fluff
5e14a03743 Fixing lava
Fixes some lava
2023-03-21 15:20:53 -04:00
Fluff
27d7c2acc4 Yeeted any loose mice, an APC, and hutner xenos
Title says all
2023-03-19 23:14:22 -04:00
Casey
048ffe5b4e Merge pull request #14710 from Heroman3003/ambiencertfx
Fixes ambience runtime
2023-03-18 21:01:39 +00:00
Nadyr
b259cb47ef Merge pull request #5963 from CHOMPStation2/upstream-merge-14678
[MIRROR] Frozen Organ Crates
2023-03-17 20:40:00 -04:00
Kassc
aecf626497 Merge pull request #5951 from FluffMedic/Spider
Spidertide Manor Addition
2023-03-17 18:31:14 -04:00
Heroman3003
d2543ddf47 Merge pull request #14678 from KillianKirilenko/kk-talontweaks
Frozen Organ Crates
2023-03-17 21:05:28 +00:00
Nadyr
25ef364bd2 Merge pull request #5960 from CHOMPStation2/upstream-merge-14701
[MIRROR] Shuttle Bay signs
2023-03-17 04:03:28 -04:00
Nadyr
5bbc06a4f3 Merge pull request #5937 from CHOMPStation2/upstream-merge-14616
[MIRROR] Creates framework for renaming visitable overmap objs on initialization
2023-03-17 03:24:01 -04:00
Nadyr
9099233ffb Merge pull request #5911 from tacoguy7765093/kneejerk
Prevents use of the technomancer teleporter in VR
2023-03-17 03:12:49 -04:00
Bib Bob
a48334633c fukc yuo runtimes 2023-03-17 01:57:03 -05:00
Bib Bob
11f876ae39 oops forgot to put area 2023-03-17 01:30:12 -05:00
Heroman3003
b333971955 Shuttle Bay signs 2023-03-17 01:06:16 +00:00