BongaTheProto
650642d379
Merge remote-tracking branch 'upstream/master'
2023-07-20 00:23:25 -05:00
SandPoot
1ec6b97ea3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-07-19 18:01:35 -03:00
SandPoot
217e23fc7f
push
2023-07-18 15:22:24 -03:00
BongaTheProto and GitHub
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
Pin-alternative
cd29d1e6bc
changes
2023-04-23 17:17:52 +10: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
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
BongaTheProto and GitHub
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
SandPoot and GitHub
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
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
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
ed06e686e1
pushies.
2023-01-31 16:40:17 -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
a04476b38d
Merge remote-tracking branch 'upstream/master'
2022-12-16 20:39:53 -05:00
SandPoot
011dd2e817
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-12-16 16:47:19 -03:00
Pin-alternative
74841cfabc
Merge remote-tracking branch 'upstream/master' into rework
2022-12-15 19:48:05 +11:00
Lin and GitHub
7d0c3df2ad
Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo
...
dullahans 2: electric boogaloo
2022-12-14 19:07:59 -07:00
BongaTheProto
ee6823c69b
Merge remote-tracking branch 'upstream/master'
2022-12-13 12:14:11 -05:00
SandPoot
f4b7513f10
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-12-13 01:35:33 -03:00
Darius
f5cf485321
Separate max age from max age input
...
The maximum character age a user can manually input is now defined by AGE_MAX_INPUT instead of AGE_MAX. These values are identical by default.
Also reverts the change to dialog box text.
2022-12-09 08:00:19 -05:00
Darius
7321d42ea5
Reduce max age from INFINITY to SHORT_REAL_LIMIT
...
This effectively reduces the cap to 16777216.
2022-12-08 05:38:47 -05:00
Darius
0924175001
Remove maximum age
...
Allows characters to be any age above the minimum. Does not remove or change AGE_MAX definition.
2022-12-08 03:46:32 -05:00
Pin-alternative
5cc27b4be6
Merge remote-tracking branch 'upstream/master' into rework
2022-10-23 16:53:43 +11:00
Pin-alternative
d57be23411
sizes rework
2022-10-23 16:53:39 +11:00
BongaTheProto
b722359efd
new butthole sprite
...
squished alt
2022-10-09 19:17:42 -05:00
BongaTheProto
7b25cd111a
teh... donut...
...
complaints incoming
2022-10-03 22:58:32 -05:00
BongaTheProto