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 2026-08-30 08:07:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
22590 Commits
Author SHA1 Message Date
Pin-alternative 6474cb5e6f changes 2023-03-08 08:14:16 +11:00
BongaTheProto 57a7a516e6 Merge remote-tracking branch 'upstream/master' 2023-03-06 22:43:10 -05:00
SandPoot d63c2ebdd8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-03-05 12:35:35 -03:00
Pin-alternative 74c4a3748f impl 2023-03-05 20:09:48 +11:00
Pin-alternative 4ff94bb142 add min size 2023-03-05 20:02:51 +11:00
Pin-alternative 5ce56db316 Merge branch 'rework' of pin:Pin-alternative/S.P.L.U.R.T-Station-13 into rework 2023-03-05 19:17:54 +11:00
Pin-alternative d1b3acbc5c Merge remote-tracking branch 'upstream/master' into rework 2023-03-05 19:16:26 +11:00
Pin-alternative 3811cb58ec remove stuff 2023-03-05 18:57:58 +11:00
siliconsandGitHub 6efd3098d4 Merge pull request #15961 from zeroisthebiggay/sevakillmarktwo 
Removes the SEVA suit, replacing it with the HEVA suit - an ash-storm proof alternative.
 2023-03-04 23:36:36 -08:00
BongaTheProto d0fa6c842e Merge remote-tracking branch 'upstream/master' 2023-03-01 14:58:31 -05:00
SandPoot a1823e7ca8 fix pixel shift 2023-02-27 19:36:01 -03:00
Lex ef59cfd870 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into port-ability-to-change-AI/Robot-laws 2023-02-26 03:31:15 +03:00
Darius 556840700f Better old-shift compatability 
This commit:
- Moves the pixel shifting defines to mob defines
- Updates pixel shifting define names to be more unique
- Updates old pixel shifting to use shift limits
 2023-02-24 20:10:55 -05:00
Darius 71e83499fc Allow classic pixel shifting 
Uncomments the removed lines for pixel shifting verbs, allowing them to be used again.
 2023-02-24 19:49:32 -05:00
BongaTheProtoandGitHub 151306bb69 Merge pull request #733 from LeDrascol/overhaul-quirk-dumb4cum 
Modularize Dumb For Cum quirk
 2023-02-24 18:32:18 -05:00
BongaTheProto acf6b87535 Merge remote-tracking branch 'upstream/master' 2023-02-24 01:39:26 -05:00
SandPoot f0dcf824a7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-24 01:59:45 -03:00
LinandGitHub 69a487e3bd Merge pull request #15973 from SandPoot/screentips-update 
Screentips context help now have advanced, fancy icons (with a way to disable it for only text)
 2023-02-23 21:49:51 -07:00
LinandGitHub 00fe11ee3a Merge pull request #15974 from SandPoot/does-aligning-the-correct-way 
Does runechat aligning properly
 2023-02-23 21:22:03 -07:00
LinandGitHub 5f0739b216 Merge pull request #15976 from SandPoot/duct-piping 
Several duct pipe fixes/qol
 2023-02-23 21:16:44 -07:00
LinandGitHub 1a9fae43d0 Merge pull request #15977 from SandPoot/sendtonull 
Fix solar construction, again
 2023-02-23 21:13:59 -07:00
SandPoot cc8d385371 sanity 2023-02-24 01:11:12 -03:00
SandPoot e6d471ef0d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into screentips-update 2023-02-24 01:07:49 -03:00
SandPoot b2f7fc5a9e over action buttons also very cool you guy that hates my fancy hints, hope you know how to do everything 2023-02-24 01:07:27 -03:00
Darius d48025140b Merge branch 'master' into overhaul-quirk-dumb4cum 2023-02-23 00:37:04 -05:00
BongaTheProto 2151624f10 Merge remote-tracking branch 'upstream/master' 2023-02-22 19:14:08 -05:00
SandPoot 77969d5e2e yes 2023-02-21 20:43:48 -03:00
SandPootandSandPoot 2bdec078d7 Merge pull request #311 from Sandstorm-Station/duct-piping 
Several duct pipe fixes/qol
 2023-02-21 16:44:35 -03:00
SandPoot e0c8419cdd deal with duct pipes 2023-02-21 16:09:35 -03:00
SandPoot 11a06b1686 pixelshift + layering 2023-02-21 14:27:10 -03:00
SandPoot 992d25ea08 Revert "pixelshift + layering" 
This reverts commit 51818478c5.
 2023-02-21 14:25:29 -03:00
SandPoot 51818478c5 pixelshift + layering 2023-02-21 14:20:48 -03:00
zeroisthebiggayandGitHub 266e5892f0 Update assistant.dm 2023-02-21 05:21:09 -05:00
SandPoot 13e0c6de7e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-21 02:04:25 -03:00
SandPoot d287fc25ca poosh 2023-02-21 01:55:49 -03:00
zeroisthebiggayandGitHub 4d72fd3ddf Update explorer_gear.dm 2023-02-20 22:53:26 -05:00
BongaTheProtoandGitHub 4f44965172 Merge pull request #765 from SPLURT-Station/old-character-menu 
Brings back the old character creation menu
 2023-02-20 11:52:05 -05:00
BongaTheProto 5ec4443259 Merge remote-tracking branch 'upstream/master' 2023-02-20 11:36:04 -05:00
Darius 86b4f6c6ec Merge branch 'master' into overhaul-quirk-dumb4cum 2023-02-19 20:23:16 -05:00
SandPootandGitHub 2aad51d60b [HURRY-UP] Screentips context help now have advanced, fancy icons (with a way to disable it for only text) (#307) 
* new icon with adjustments for it

* lizard content
 2023-02-19 14:55:14 -03:00
SandPoot 09ebd0fddf lizard content 2023-02-19 03:46:36 -03:00
Darius 12f3f9781a Sanitize screentip colors 
Sanitize screentip colors as hexcolor when saving, to prevent possible cases of null values that could break the interaction screentips.

Solution provided by SandPoot, in response to an issue posted by BongaTheProto.
 2023-02-18 22:48:21 -05:00
BongaTheProto 58aa56c57b frankenstein 2023-02-17 22:52:32 -05:00
Pin-alternative 37b3778581 no max size required 2023-02-17 22:39:19 +11:00
Pin-alternative 37a690f117 linkage 2023-02-17 21:39:51 +11:00
Pin-alternative 05e486ea8e Merge remote-tracking branch 'upstream/master' into rework 2023-02-17 21:13:35 +11:00
BongaTheProto b61500c13a followup 2023-02-16 17:04:00 -05:00
BongaTheProto 972df3f711 Merge remote-tracking branch 'upstream/master' 2023-02-16 16:30:59 -05:00
SandPoot 072087ec14 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-15 20:22:44 -03:00
SandPootandGitHub 2bf781580e Merge branch 'master' into new-decal-painter 2023-02-15 20:06:29 -03:00