Commit Graph
1577 Commits
Author SHA1 Message Date
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
LinandGitHub 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
Le Commandor 92b891ac7c 1234 2022-12-10 17:13:24 +04:00
Le Commandor 360d059b1f 123 2022-12-10 17:11:46 +04:00
Le Commandor a608f3b8cb Suggestion#3611, adds LOOC for unconscious. 2022-12-10 15:54:53 +04: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 e1cb9c8346 Merge remote-tracking branch 'upstream/master' 2022-09-27 23:19:10 -05:00
SandPoot f039efca97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-27 01:19:55 -03:00
shellspeed1 17f513eae4 Fixes clicking in the object menu but at what cost 2022-09-20 23:08:24 -07:00
shellspeed1 f2ed6a571c this gets it to the point it compiles 2022-09-09 18:04:52 -07:00
shellspeed1 fbc80cf829 initial port 2022-09-09 00:29:20 -07:00
ItsSelis b45db075fe Merge branch 'master' into tgui-input-framework 2022-09-03 23:59:32 +02:00
BongaTheProtoandGitHub a26e39628e Merge pull request #349 from Pin-alternative/cursed
Pregnancy and oviposition mechanics
2022-09-02 20:13:20 -05:00
BongaTheProto b287251261 Merge remote-tracking branch 'upstream/master' 2022-08-31 19:46:05 -05:00
SandPoot d9b51fa748 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-31 19:39:24 -03:00
ItsSelis cb7e71a7b9 Added Prefs 2022-08-31 16:51:51 +02:00
ItsSelis 33d9cfe733 TGUI Input Framework 2022-08-31 16:38:16 +02:00
Pin-alternative 9e377c644b Merge remote-tracking branch 'upstream/master' into cursed 2022-08-23 07:41:40 +10:00
Putnam3145 139bcaa1b5 whoops forgot a bit of migration 2022-08-21 16:47:39 -07:00
Putnam3145 3700b9bbe5 Allows setting antags to "low" 2022-08-21 16:42:39 -07:00
BongaTheProto 3341812b44 Merge remote-tracking branch 'upstream/master' 2022-08-20 17:16:19 -05:00
SandPoot 550db1b6ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-20 17:27:19 -03:00
LinandGitHub 4b21981547 ooc colour shenanigans (#15788) 2022-08-20 01:41:20 -07:00
Pin-alternative 9ba41fb085 Merge remote-tracking branch 'upstream/master' into cursed 2022-08-15 07:55:25 +10:00
timothyteakettle 2313a24918 Merge branch 'master' into dullahan-2-electric-boogaloo 2022-08-11 14:43:48 +01:00
Timothy Teakettle 529ada40ef auto retry 2022-08-08 16:36:15 +01:00
BongaTheProto 9e7c5033cc Merge remote-tracking branch 'upstream/master' 2022-08-07 21:42:16 -05:00
Timothy Teakettle a2f4ea39af attempted fix at the ready-up issue 2022-08-08 00:29:20 +01:00
Timothy Teakettle 9a8c356f24 slightly better 2022-08-08 00:17:56 +01:00
Timothy Teakettle b5e70ba008 we do a little fix 2022-08-08 00:08:13 +01:00
SandPoot 6108e1d522 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-07 19:46:26 -03:00
Hatterhat 959fa45d3c client prefs! per-gun recoil multipliers! 2022-08-05 16:00:19 -05:00
Timothy Teakettle b4330b2f3d GOODBYE SPECIES, HELLO COMPONENT 2022-08-05 18:19:22 +01:00
Timothy Teakettle b05f6e221d MIGRATIONS DELETIONS AND QUIRKS OH MY 2022-08-05 18:06:49 +01:00
Pin-alternative 5c44cad61e Merge remote-tracking branch 'upstream/master' into cursed 2022-07-25 20:35:54 +10:00
BongaTheProto 811c1df810 Merge remote-tracking branch 'upstream/master' 2022-07-24 12:05:49 -05:00
SandPoot 0a0e4de14b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-07-24 02:59:28 -03:00
42f14aaef2 Update code/modules/client/client_procs.dm
Co-authored-by: deathride58 <deathride58@users.noreply.github.com>
2022-07-23 14:28:09 -07:00
Pin-alternative d44e4cf056 stuffo 2022-07-22 22:56:10 +10:00
Pin-alternative e948a7e12d balls 2022-07-14 14:02:48 +10:00