Commit Graph
1577 Commits
Author SHA1 Message Date
BongaTheProtoandGitHub 5ec4426798 Merge pull request #845 from SPLURT-Station/character-ads
Ports the character directory
2023-05-27 14:27:24 -05:00
BongaTheProto f74b876b5e we've got a new menu boys
those crewmembers are looking quite exquisite today
also felinids are half-price
2023-05-20 15:38:43 -05:00
BongaTheProto 8c42034e40 only 16 pixels??? Bruh?????
Reinstates the original pixelshift range and also makes the viewport shifting a config so people don't get vertigo from the sliding sprites
2023-05-19 23:35:56 -05:00
WoolyAypa 36f8a4ea71 Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system 2023-04-26 16:12:15 -03:00
BongaTheProtoandGitHub 994f14c5d5 Merge pull request #520 from Pin-alternative/rework
Reworks to genitals
2023-04-23 14:47:32 -05:00
BongaTheProto 525741658b shaft beast? Like hype beast but with cocks? 2023-04-23 13:55:45 -05:00
Pin-alternative cd29d1e6bc changes 2023-04-23 17:17:52 +10:00
WoolyAypa f70e1e901e Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system 2023-03-24 23:46:54 -03: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
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
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
BongaTheProto 2151624f10 Merge remote-tracking branch 'upstream/master' 2023-02-22 19:14:08 -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
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
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 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
BongaTheProto 3f376c1bb3 Merge remote-tracking branch 'upstream/master' 2023-02-13 19:36:05 -05:00
SandPootandGitHub 4a01b9f5e2 Re-UI-ing (just steals old skyrat) (#302)
* send it

* redefining counts as error, so goodbye
2023-02-13 00:22:01 -03:00
WoolyAypa 078413e553 Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system 2023-02-11 22:37:34 -03:00
WoolyAypa e4d35beb7d hope it works 2023-02-11 16:28:54 -03:00
WoolyAypa 94d24dfb31 mebbe? 2023-02-11 12:22:05 -03:00
Pin-alternative 828c84a4dd whoops 2023-02-10 23:26:59 +11:00
Pin-alternative ec9ec618b2 b 2023-02-10 19:00:29 +11:00
Pin-alternative 4fe58fc420 add it back 2023-02-09 19:46:05 +11:00
SandPoot 4491abc2d7 updates to most recent version and puts intent hints! 2023-02-09 02:20:02 -03:00
BongaTheProto 79e84f961a le chars tm
how do you even reach the saves limit brah
2023-02-07 18:31:55 -05:00
SandPoot ed06e686e1 pushies. 2023-01-31 16:40:17 -03:00
WoolyAypa f04f9ce559 doone, opt-out pref 2023-01-19 00:43:16 -03:00
WoolyAypa 4cd6975b3b conflictos 2023-01-18 21:27:19 -03:00
Pin-alternative a4e3b8a3b9 blegh 2023-01-16 21:48:45 +11:00
Pin-alternative 17a8fb452e Merge remote-tracking branch 'upstream/master' into rework 2023-01-16 20:26:27 +11:00
BongaTheProto 8034d9fb22 Merge remote-tracking branch 'upstream/master' 2022-12-31 14:31:12 -05:00
SandPoot d337852c68 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-28 16:56:04 -03:00
Hatterhat 05178784d4 sanitize 2022-12-26 01:38:44 -06:00
Hatterhat 55826b9eb8 oops 2022-12-20 20:02:28 -06:00
BongaTheProto 239f038d74 neck fire
it works with the update now
2022-12-16 21:50:54 -05:00