Commit Graph

75041 Commits

Author SHA1 Message Date
Verkister
3f73695408 kiss me 2023-05-24 21:48:03 +03:00
Verkister
9d7ada0847 Adds 2 more borgis.
Adds a new minerborgi in brown and unityborgi in the original old-Ian color scheme.
2023-05-24 21:45:26 +03:00
Darlantan
ac96197d7f VR code tweaks, mob TF, ghost joining, qdel to VR escapees 2023-05-24 08:42:09 -04:00
Nadyr
5f07c2a152 Merge pull request #6232 from Verkister/patch-69
Fixes proteans being immune to duffle chonk
2023-05-24 05:24:04 -04:00
Verkister
732fb67be6 Fixes proteans being immune to duffle chonk
Probably wouldn't have even noticed if it wasn't for some gamer deciding to flex this exploit with the double-duffle-slowdown taur saddlebags as non-taur of all things instead of just going with a regular duffle of same capacity.

Also why the f do the saddlebags even have 2x duffle slowdown in the first place? that's messed up.
2023-05-23 23:41:43 +03:00
ItsSelis
dc8675c24d Compile our bundle 2023-05-23 17:43:16 +02:00
ItsSelis
3da68ee1b6 Bundle Copy 2023-05-23 17:43:01 +02:00
Nadyr
8aad48f508 Merge pull request #6230 from CHOMPStation2/upstream-merge-14888
[MIRROR] Adds missing license headers
2023-05-22 18:18:05 -04:00
Nadyr
60473da612 Merge pull request #6227 from CHOMPStation2/upstream-merge-14874
[MIRROR] Adds new preference for vore privacy
2023-05-22 18:17:24 -04:00
CHOMPStation2
ea3ca7e6d5 Adds missing license headers 2023-05-22 19:29:57 +00:00
Casey
190ae0af96 Merge pull request #14888 from ItsSelis/master
Adds missing license headers
2023-05-22 19:29:57 +00:00
Victor Zisthus
d0731aac1b Miner map fixes
Z2

Fixes missing atmos vents and scrubbers in Research server room.

Fixes Atmos custom mix input and output.

Adds ShieldGen bypass breaker boxes.
2023-05-22 04:59:57 -04:00
Darlantan
6c156ffa29 bundle that makes you say yes 2023-05-22 01:46:38 -04:00
Nadyr
ee0393d8e0 powder that makes yous ay yes 2023-05-22 01:37:14 -04:00
Nadyr
e77616bf04 powder that makes you say yes 2023-05-22 01:37:14 -04:00
Nadyr
8fe785b593 powder that makes you say yes 2023-05-22 01:37:14 -04:00
Nadyr
c7c2aadab5 powder that makes you say yes 2023-05-22 01:37:14 -04:00
Nadyr
3f183b0f64 powder that makes you say yes 2023-05-22 01:37:14 -04:00
Nadyr
2d6bb5f3d6 powder that makes you say yes 2023-05-22 01:37:14 -04:00
Heroman3003
83aa5b374d Adds new preference for vore privacy 2023-05-22 01:37:14 -04:00
Nadyr
f3dd0de1e2 Merge pull request #6224 from CHOMPStation2/upstream-merge-14873
[MIRROR] SatinIsle Fluff items plus long snout
2023-05-22 01:24:36 -04:00
Nadyr
0cb603c61b Merge pull request #6225 from CHOMPStation2/upstream-merge-14878
[MIRROR] Face DMI cleanup/fixes
2023-05-22 00:21:04 -04:00
Nadyr
e73373d655 Merge pull request #6219 from CHOMPStation2/upstream-merge-14868
[MIRROR] Bone remains variation system + synth and borg "bones"
2023-05-22 00:18:25 -04:00
Nadyr
884294e07e Merge pull request #6218 from CHOMPStation2/upstream-merge-14866
[MIRROR] adds a smattering of clothes sourced from SR & TG
2023-05-22 00:16:06 -04:00
Nadyr
e00c315cb0 powder that makes you say yes 2023-05-22 00:10:54 -04:00
Nadyr
34a83f52c9 powder that makes you say yes 2023-05-22 00:05:32 -04:00
Nadyr
6b441a2d49 powder that makes you say yes 2023-05-22 00:04:12 -04:00
Darlantan
d8f26784f7 powder that makes you say yes 2023-05-21 23:57:28 -04:00
Nadyr
53777fbcd9 Merge pull request #6223 from Verkister/patch-68
Fixes access to belly sprite settings on 1-belly mobs
2023-05-21 23:53:42 -04:00
Nadyr
d526885317 Merge pull request #6222 from CHOMPStation2/upstream-merge-14871
[MIRROR] Temporary disposal outlet fix
2023-05-21 23:52:40 -04:00
Nadyr
0fdc9bc895 Merge pull request #6221 from CHOMPStation2/nanomaps_generation
Automatic NanoMap Update
2023-05-21 23:52:13 -04:00
Heroman3003
b31bdcc957 adds a smattering of clothes sourced from SR & TG 2023-05-21 23:49:31 -04:00
Nadyr
d7294845fe powder that makes you say yes 2023-05-21 23:48:59 -04:00
Nadyr
bbc6fc674b Merge pull request #6215 from CHOMPStation2/upstream-merge-14869
[MIRROR] Adds privacy and bleeding control to bloodsucker trait
2023-05-21 23:07:55 -04:00
Nadyr
6542fdb579 Merge pull request #6212 from CHOMPStation2/upstream-merge-14856
[MIRROR] Fixes the Major Bill's Shipping Softcap
2023-05-21 22:57:16 -04:00
Nadyr
6eb084efcc Merge pull request #6217 from ItsSelis/master
TextBox Shift-Enter (Multilines)
2023-05-21 22:56:23 -04:00
Nadyr
a486cb0537 Merge pull request #6211 from CHOMPStation2/upstream-merge-14859
[MIRROR] Mech Nanopaste repairs fix
2023-05-21 22:53:33 -04:00
Nadyr
d0817644bc Merge pull request #6209 from CHOMPStation2/upstream-merge-14852
[MIRROR] Vulp Commonwealth Helmets
2023-05-21 22:34:00 -04:00
Nadyr
2f27e3bf76 Merge pull request #6208 from Verkister/patch-67
Excludes diet stomacid from digestion/absorption reagent transfer
2023-05-21 22:23:30 -04:00
Nadyr
d3c2d16a70 Merge pull request #6207 from Kazzc/Examplemaps
Sample maps
2023-05-21 22:19:55 -04:00
CHOMPStation2
95f05f5d6a Face DMI cleanup/fixes 2023-05-21 19:12:42 +00:00
Heroman3003
46cd810a43 Merge pull request #14878 from KillianKirilenko/kk-nanofix
Face DMI cleanup/fixes
2023-05-21 19:12:42 +00:00
Heroman3003
60a7535912 SatinIsle Fluff items plus long snout 2023-05-21 19:11:34 +00:00
Verkister
c7e1b6b606 Fixes access to belly sprite settings on 1-belly mobs
While I do understand the original intention to remove unnecessary clutter from vorepanel, there was one little oversight that actually just broke something.

Trying to change the setting on an existing vorgan setup while playing a 1-belly simplemob was made completely impossible, which kind of became a problem when that vorgan setup was loaded from a character slot using the taur belly option (nonfunctional for the mob) and being completely unable to change that to regular stomach setting that would work for the mob.
2023-05-21 20:00:53 +03:00
CHOMPStation2
fd3f87c542 Temporary disposal outlet fix 2023-05-20 08:21:37 +00:00
Heroman3003
d135214762 Merge pull request #14871 from ReoDaProtovali/DisposalButEpic-1
Temporary disposal outlet fix
2023-05-20 08:21:37 +00:00
NanoMap Generation
ddac50718f NanoMap Auto-Update (Sat May 20 00:43:09 UTC 2023) 2023-05-20 00:43:09 +00:00
Kassc
5abe5e7665 Merge pull request #6220 from VictorZisthus/sc-updates-may2023
General Map Updates & Fixes
2023-05-19 20:40:05 -04:00
Victor Zisthus
b35979eae5 Tinyfan-B-Gone
NEW ATMOS SHIELDS LET'S GOOOOOO!!!!

Also adjusted the power generator to compensate while still causing power issues if not properly handled!
2023-05-19 19:12:30 -04:00
Victor Zisthus
3ed4ee5fab General Map Updates & Fixes
Z1
Fixed lights.
Fixed a wrong color sofa.
Fixed missing access on an Airlock.
Nonan left a present in a secluded area! His FAVORITE plant!

Z2
Adjusted target pressure on Waste Loop to a more universal value. It still stays stuck closed at roundstart.

Z7
Fixed Engineering/Atmos not having access to the Explo carrier to fix breaches.

Z10 + 12
Overhauled wilderness shelter again.
2023-05-19 18:45:52 -04:00