Commit Graph
699 Commits
Author SHA1 Message Date
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
SandPoot f0dcf824a7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-24 01:59:45 -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
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
SandPoot 072087ec14 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-15 20:22:44 -03: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
SandPoot 4491abc2d7 updates to most recent version and puts intent hints! 2023-02-09 02:20:02 -03:00
SandPoot ed06e686e1 pushies. 2023-01-31 16:40:17 -03: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
SandPoot d9b51fa748 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-31 19:39:24 -03:00
Putnam3145 3700b9bbe5 Allows setting antags to "low" 2022-08-21 16:42:39 -07: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
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
SandPoot 07a4c5c12b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-11 04:54:12 -03:00
deathride58 381c8fe183 additional cleanup - turns bark variance into a macro for easy consistency 2022-06-10 04:05:02 -04:00
deathride58 2a720ce054 vocal barks - Fully customizable noises for talking! 2022-06-09 03:59:17 -04:00
SandPoot 0d9646702d quick fix 2022-06-03 21:42:15 -03:00
SandPootandGitHub 461bfc3f9c Fixing some stuff about sizecode (#257) 2022-06-03 19:45:19 -03:00
SandPoot 89fa5c0bfe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-05-21 00:13:59 -03:00
siliconsandGitHub fd7b64c886 Merge pull request #15625 from Citadel-Station-13/Linzolle-patch-1
Allow numbers in character names
2022-05-20 12:36:48 -07:00
SandPoot da1f58f297 Update files 2022-05-19 13:23:17 -03:00
SandPoot 1e579c48fa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-05-18 02:49:40 -03:00
LinandGitHub b6f176dd8d allow numbers in character names 2022-05-16 13:44:01 -07:00
Timothy Teakettle 1c9f6077da loadout organisation 2022-05-16 21:22:22 +01:00
Timothy Teakettle 924bca64d1 Update preferences.dm 2022-05-16 16:38:50 +01:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
siliconsandGitHub 73d39db3c1 Merge pull request #15343 from SandPoot/deadmin-prefs
Ports Automatic Deadminning from TG
2022-04-15 17:44:55 -07:00
SandPoot 282941ca5b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-31 00:21:11 -03:00
3687361ba5 Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) (#15304)
* Butts

* testicle fix + hidden is back

* updated booba

* prob bad idea actually thinking about icon states

* fuck

* this should be everything now

* SandPoot's suggestion

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* tguify that last option

* Revert "tguify that last option"

This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.

* Revert "Merge branch 'master' into cursingcitadel"

This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.

* Revert "Revert "Merge branch 'master' into cursingcitadel""

This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2022-03-30 20:06:00 -07:00
SandPootandGitHub e9637bb688 Merge branch 'master' into deadmin-prefs 2022-03-22 15:35:46 -03:00
SandPoot 7a2cc5ddfa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-10 22:03:11 -03:00
SandPoot 45a49c6106 Upload files 2022-03-05 13:49:26 -03:00
SandPoot c938a36f13 moves color details and adds to some who don't have it 2022-03-03 16:09:57 -03:00
SandPoot 0fa5987105 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-01 14:06:17 -03:00
Timothy TeakettleandGitHub 778bf1777b fixes coiling issue (#15530)
* why

* new signals for resting and stop pulling

these are to be used as signals that will cancel the coiling

* Create coiling.dm

* Update coiling.dm

* adds sprite accessory for coiled naga

* main changes that apply the actual visuals to the coiling mechanics

* adds message to coiling, fixes offset, adds action icon

* coil offset was using old direction

* reordering

* fixes coil sprite not disappearing

* fixes offsets, solves loadout issue

* follows lin's suggestion and adds support for slimes by making it entirely handled in handle mutant

* fix

* Update preferences.dm

* no slimes you're not allowed the hidden sprite
2022-02-28 14:01:57 -08:00
SandPoot fb7a24b333 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-27 14:17:53 -03:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
SandPoot 598dcc5828 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-24 13:44:22 -03:00
Timothy TeakettleandGitHub f6b9858f4f adds snake coiling (#15514)
* new signals for resting and stop pulling

these are to be used as signals that will cancel the coiling

* Create coiling.dm

* Update coiling.dm

* adds sprite accessory for coiled naga

* main changes that apply the actual visuals to the coiling mechanics

* adds message to coiling, fixes offset, adds action icon

* coil offset was using old direction

* reordering

* fixes coil sprite not disappearing

* fixes offsets, solves loadout issue

* follows lin's suggestion and adds support for slimes by making it entirely handled in handle mutant
2022-02-23 22:01:13 -07:00
SandPoot 7523279254 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-07 22:07:59 -03:00
siliconsandGitHub af6e43c595 refactors clickcatchers/parallax/fullsceren (#15460)
* :)

* that

* move those there

* refactor that too

* wew

* stuff

* almost.

* sigh

* just need speed

* stuf

* pain

* hm

* tweaks

* that

* eh

* wack

* a

* done

* that's important

* wacky

* all that

* fixes

* typo

* that

* a

* funny

* that

* that

* woo

* help im losing my fucking mind

* okay

* fix
2022-02-07 15:17:24 -08:00
SandPoot 3bbe8d199c emergency merge 2022-02-05 00:48:43 -03:00
SandPoot e8c8d2b0ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-25 11:38:07 -03:00