cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,249 Commits 55 Branches 0 Tags
5116acad15f301d528039606cb63af6bff3bbcf2
Commit Graph

54249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sandstorm Bot
20e19543ea Automatic changelog compile [ci skip] 2023-03-14 15:22:44 +00:00
Sandstorm Bot
a716c63147 Automatic changelog generation for PR #320 [ci skip] 2023-03-14 15:21:31 +00:00
SandPoot
04ff937cfc Merge pull request #320 from Dexxiol/spriting-fixes 
Clothing sprite fixes
 2023-03-14 12:20:12 -03:00
Dexxiol
0f5f654b3a Clothing sprite fixes 
Affected: Cargo uniforms, duffelbags, yoga pants
 2023-03-14 18:01:38 +03:00
BongaTheProto
534ec7a998 Update supermatter.dm 2023-03-14 00:42:16 -05:00
BongaTheProto
1213be13b6 Merge remote-tracking branch 'upstream/master' 2023-03-13 21:42:07 -05:00
Sandstorm Bot
a849a4c3b2 Automatic changelog compile [ci skip] 2023-03-14 02:13:40 +00:00
Sandstorm Bot
2aaa67be34 Automatic changelog generation for PR #319 [ci skip] 2023-03-14 02:12:37 +00:00
SandPoot
e2a970bf45 Merge pull request #319 from DeDrascol/revert-rnd-lock 
Revert RnD console locks
 2023-03-13 23:11:33 -03:00
Darius
15d31031d9 Revert RnD console locks 
This commit reverts the change causing R&D consoles to be locked by default upon creation, as it had unintended consequences.
 2023-03-13 21:23:34 -04:00
BongaTheProto
c7569b07a5 Merge remote-tracking branch 'upstream/master' 2023-03-13 02:25:18 -05:00
Changelogs
beea64808f Automatic changelog compile [ci skip] 2023-03-13 05:24:31 +00:00
SPLURT Bot
c1c1e1b32b Automatic changelog generation for PR #787 [ci skip] 2023-03-13 05:22:35 +00:00
BongaTheProto
8d90668df4 Merge pull request #787 from SPLURT-Station/fixies 
Fixes datum vv
 2023-03-13 00:21:05 -05:00
KeplerWasTaken
76c8fbfd3f Merge branch 'mechdrillfix' of https://github.com/KeplerWasTaken/S.P.L.U.R.T-Station-13 into mechdrillfix 2023-03-12 12:00:30 +01:00
KeplerWasTaken
f6352383d5 Lavaland syndicate base now has a regular RD Console Board so they can sync their technologies via the protolathe 2023-03-12 11:59:47 +01:00
KeplerWasTaken
6516901a9c Mech Drill now no longer works if the target is further away than 1 tile, and the diamond drill applies the correct damage 2023-03-12 10:37:25 +01:00
BongaTheProto
9975150800 Update unsorted.dm 2023-03-12 02:15:46 -05:00
SandPoot
1a75f528aa Merge pull request #318 from Sandstorm-Station/lusty-sight 
Allows for seeing lust levels inside the Interaction menu
 2023-03-12 04:05:45 -03:00
SandPoot
0dd6daf5d5 lust sight 2023-03-12 03:02:00 -03:00
Changelogs
1fc69d8c94 Automatic changelog compile [ci skip] 2023-03-11 04:04:43 +00:00
SPLURT Bot
d636dfb1e2 Automatic changelog generation for PR #761 [ci skip] 2023-03-11 04:03:07 +00:00
BongaTheProto
0c01f49a4b Merge pull request #761 from LeDrascol/refactor-internal-fluid-list 
Refactor organ fluid whitelist code
 2023-03-10 23:01:36 -05:00
Darius
70ff07479b Fix skipped reagent list paths entry for gfluid 
Adds a missing lazyadd for `reagent_list_paths` to the reagent list building.

Co-Authored-By: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
 2023-03-09 23:31:49 -05:00
Darius
c283277fdc Merge branch 'master' into overhaul-quirk-nudist 2023-03-09 23:16:10 -05:00
Darius
31e6236ee5 Merge branch 'master' into quirk-hypno-expanded 2023-03-09 23:14:17 -05:00
Changelogs
28e7e72ba0 Automatic changelog compile [ci skip] 2023-03-10 03:33:51 +00:00
SPLURT Bot
86d1ad5a49 Automatic changelog generation for PR #782 [ci skip] 2023-03-10 03:32:21 +00:00
BongaTheProto
50ad0e3401 Merge pull request #782 from NopemanMcHalt/pr-ex/prisarch2 
Allows prison jumpsuits to be reskinned, complimenting alternative titles for prisoners
 2023-03-09 22:30:52 -05:00
BongaTheProto
09e336118f Merge remote-tracking branch 'upstream/master' 2023-03-09 22:15:43 -05:00
Darius
36c8bbb024 Remove alternate mech fabricator locks 
This commit removes access requirements from the `maint` and `offstation` variants of the mech fabricator.
 2023-03-09 20:57:47 -05:00
Darius
05db5f8997 Add robotics production restrictions 
This commit updates the production machinery restrictions to include mech fabricators. Old production check code has been updated for use with generic machines, and some checks have been moved.
 2023-03-09 20:46:51 -05:00
Pin-alternative
cdf7f73852 fix 2023-03-10 09:13:36 +11:00
Bobabiboo
65275e8d84 Merge branch 'master' of https://github.com/Boopideedoo/S.P.L.U.R.T-Station-13 2023-03-09 12:09:32 -05:00
Bobabiboo
2478d6891a Fixes a map bug where the incenerator had unary vents inplace of scrubbers 2023-03-09 12:09:27 -05:00
Anonymous
f5f8b9ffe9 Added vampire prisoner variant 2023-03-09 19:19:03 +03:00
SandPoot
bd0d23de3d Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13 2023-03-09 02:58:04 -03:00
SandPoot
9aeb252ad5 fix 2023-03-09 02:57:41 -03:00
Sandstorm Bot
077e602d9f Automatic changelog compile [ci skip] 2023-03-08 21:34:53 +00:00
Sandstorm Bot
9aa4b7d81b Automatic changelog generation for PR #316 [ci skip] 2023-03-08 21:33:41 +00:00
SandPoot
80cfd2e838 Merge pull request #316 from DeDrascol/protolock-allow-materials 
Allow material access from protolathes
 2023-03-08 18:32:38 -03:00
Darius
f30815b889 Production topic restrictions rework 
- Production access checks now use the `allowed` proc before attempting normal ID checks.
- Each successful return case now uses a unique DEFINE to allow future control over access types.
- Topic checks use a separate function
- Feedback messages have been moved out of the access check procs
 2023-03-07 20:51:05 -05:00
Pin-alternative
98707d4135 fix get fluids 2023-03-08 09:31:02 +11:00
Darius
720b4be2c1 Allow material access from protolathes 
Allows crew with `ACCESS_MINERAL_STOREROOM` access to use production machinery in 'mineral only' mode when normal access isn't found.
 2023-03-07 16:39:03 -05:00
Pin-alternative
1c1460ecd7 Merge remote-tracking branch 'upstream/master' into rework 2023-03-08 08:14:47 +11:00
Pin-alternative
6474cb5e6f changes 2023-03-08 08:14:16 +11:00
Nopeman McHaltz
50895ee567 Applying change requests 
I am lazybones, I know --Nopeman.

Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
 2023-03-07 17:17:31 +03:00
Changelogs
5db683b581 Automatic changelog compile [ci skip] 2023-03-07 05:35:26 +00:00
SPLURT Bot
547ffa2f3e Automatic changelog generation for PR #780 [ci skip] 2023-03-07 05:34:01 +00:00
BongaTheProto
246ff89a5d Merge pull request #780 from NopemanMcHalt/sugarcoated 
I am gonna sugarcoat it: *tt
 2023-03-07 00:32:37 -05:00