Commit Graph
1577 Commits
Author SHA1 Message Date
Timothy Teakettle 924bca64d1 Update preferences.dm 2022-05-16 16:38:50 +01:00
BongaTheProto 275eee6c7c headshots
I'll modularize this when I wake up
2022-05-09 02:40:18 -05:00
BongaTheProto b21f3bc3e6 this somehow works, ok?
aaa
2022-05-06 15:42:19 -05:00
BongaTheProto 7dae47e521 I guess lean was too much
yeah
2022-05-02 17:56:12 -05:00
BongaTheProto 28b49dab01 first should be default
defaults should be at the very top
2022-04-30 16:24:11 -05:00
BongaTheProto 6c83596460 I may regret this
but I spend too much time in it so here it goes
2022-04-29 23:33:36 -05:00
BongaTheProto 5f7d07bd33 breastmilk 2: even more milk
anyone remembers that one synth beer picture?
2022-04-28 17:14:45 -05:00
BongaTheProto 479b497b00 ok 2022-04-19 01:30:44 -05:00
AManWithAToolbox dda0869f82 Merge branch 'pr/1' into its-wasnt-gonna-happen 2022-04-18 23:19:18 -05:00
BongaTheProto 6ada3f7c94 Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen 2022-04-18 21:36:14 -05: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
nullfag a4c5fa6912 "modularity" fix 2022-04-15 00:37:05 +02:00
nullfag ea17a468a8 naked flavor text 2022-04-15 00:37:05 +02:00
SandPoot 64d18a3050 Update preferences_savefile.dm 2022-04-08 21:09:29 -03:00
BongaTheProto b601e94958 Merge remote-tracking branch 'upstream/master' 2022-03-31 00:14:54 -05: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
BongaTheProto f985127d2c Merge branch 'master' into pr/214 2022-03-10 21:06:01 -05:00
BongaTheProto 7af61efa52 Merge remote-tracking branch 'upstream/master' 2022-03-10 20:30:08 -05:00
SandPoot 7a2cc5ddfa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-10 22:03:11 -03:00
siliconsandGitHub cdefa4f64a Merge pull request #15535 from SandPoot/statpanel
Statpanel update
2022-03-10 16:50:59 -07:00
SandPoot 5f083fbddd Upload files 2022-03-05 14:22:42 -03:00
SandPoot 45a49c6106 Upload files 2022-03-05 13:49:26 -03:00
BongaTheProto 8badaaf8ec the thing
the
2022-03-04 19:51:12 -05:00
BongaTheProto 7fd35cadcc Merge remote-tracking branch 'upstream/master' 2022-03-03 15:42:53 -05:00
SandPoot c938a36f13 moves color details and adds to some who don't have it 2022-03-03 16:09:57 -03:00
BongaTheProtoandGitHub 28778e7aa9 Merge branch 'Sandstorm-Station:master' into master 2022-03-01 17:19:50 -06: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
BongaTheProto 899f66ecc6 Merge branch 'master' into pr/214 2022-02-27 15:16:13 -05:00
BongaTheProto 54aec9bd98 Merge remote-tracking branch 'upstream/master' 2022-02-27 14:38:06 -05:00
SandPoot fb7a24b333 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-27 14:17:53 -03:00
Crowbar764andGitHub 48671434ce Merge branch 'master' into player-panel-tgui 2022-02-26 10:36:06 +00:00
James a5d37e701f More cleanup 2022-02-26 09:07:58 +00:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
BongaTheProto 2ac1138ac1 Merge remote-tracking branch 'upstream/master' 2022-02-24 23:05:13 -05: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
James 6717ae7dd2 Jobban panel merged with player panel 2022-02-21 19:21:13 +00:00
James ef610eb21c WIP jobban panel 2022-02-20 18:40:00 +00:00
BongaTheProto ffcca5c46b Merge remote-tracking branch 'upstream/master' 2022-02-08 01:16:02 -05: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
James 7ae5654441 Combat cursor: Adds preference to disable it. 2022-02-06 02:35:33 +00:00
BongaTheProtoandGitHub 024cf30c95 Merge branch 'Sandstorm-Station:master' into master 2022-02-05 01:39:29 -05:00
SandPoot 3bbe8d199c emergency merge 2022-02-05 00:48:43 -03:00
James 6c3c98f180 Modularises code and stops slavers from seeing eachother's target prefs. 2022-01-30 22:09:33 +00:00
James f110d806b4 Adds antag hud, a game pref to show willingness to be kidnapped. 2022-01-30 05:50:24 +00:00