Commit Graph

581 Commits

Author SHA1 Message Date
BlueWildrose
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
SandPoot
45a49c6106 Upload files 2022-03-05 13:49:26 -03:00
Timothy Teakettle
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
5029af901b Upload files 2022-02-25 16:58:09 -03:00
Timothy Teakettle
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
silicons
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
LetterN
18b7069f1f Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-11 09:49:38 +08:00
SandPoot
8510dcc08a Ports tgui stripping (finally) (#15401)
* Upload files

* Update items.dm

* Update files

* Update files

* Update strippable.dm

* Update strippable

* Update strippable.dm

* Upload files

* Update files

* Update files

* Update files

* update files

* Update files

* Update dog.dm

* Update strippable.dm

* Update equipping

* Update strippable.d

* Upload files

* Upload files

* Update monkey.dm
2021-12-30 07:40:15 +01:00
LetterN
eb98848a9f wires this code to the PROPER prefs 2021-11-14 09:23:08 +08:00
LetterN
9a24f89780 THE fix 2021-11-10 10:33:15 +08:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
17986fea3f cannot escape 2021-10-16 14:24:22 -03:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot
bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
silicons
69bd477a72 Merge pull request #15039 from keronshb/gradiantport
Ports Colorist Quirk and Hair Gradients Preferences
2021-09-08 20:41:00 -07:00
Lin
9b888c7b01 Merge pull request #15059 from timothyteakettle/language-fixies
fixes losing your additional language upon changing species
2021-09-02 16:37:43 -05:00
timothyteakettle
a33a7ed249 fix 2021-09-01 17:54:14 +01:00
SandPoot
b2ef076043 Upload files 2021-08-26 16:44:36 -03:00
keronshb
7070a848b6 Item Highlight Port 2021-08-22 00:21:06 -04:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
silicons
24c2ab8b8c Merge pull request #14940 from timothyteakettle/trash-eating
adds a neutral trash eating quirk
2021-07-18 15:07:29 -07:00
SandPoot
3cb44d41a3 upload files 2021-07-14 00:35:30 -03:00
timothyteakettle
39c09a60b8 initial commit 2021-07-13 23:45:31 +01:00
Timothy Teakettle
da7c1ddb0a bold statement for someone who didnt test their code 2021-05-17 19:04:51 +01:00
Timothy Teakettle
6d13f09c3d Update preferences.dm 2021-05-17 11:20:47 +01:00
Timothy Teakettle
4cb0eb3418 Update preferences.dm 2021-05-17 10:59:26 +01:00
Timothy Teakettle
80d287abca index magic moment 2021-05-16 03:10:35 +01:00
timothyteakettle
7560898f94 Update preferences.dm 2021-05-10 22:53:27 +01:00
Timothy Teakettle
60673d9c5c AAAAAA 2021-05-10 17:13:24 +01:00
Timothy Teakettle
24774856bc Update preferences.dm 2021-05-10 14:34:22 +01:00
Timothy Teakettle
cfcbaa001b fixes 2021-05-10 14:31:36 +01:00
Timothy Teakettle
6926ea74ab Update preferences.dm 2021-05-10 13:58:53 +01:00
Timothy Teakettle
d479f80f9b linters are literally stupid 2021-05-08 21:19:07 +01:00
timothyteakettle
80599201cf better fix 2021-05-06 22:39:07 +01:00
Timothy Teakettle
bee9d9c047 support for the ridiculous thing i just did 2021-05-05 22:29:21 +01:00
Timothy Teakettle
3c7137f951 what if we didnt break 90% of the game 2021-05-05 18:19:02 +01:00
Timothy Teakettle
ba71bb944a im not crazy but this commit breaks 90% of the game 2021-05-05 18:11:05 +01:00
Timothy Teakettle
1664459b14 squash bugs 2021-05-05 15:26:56 +01:00
timothyteakettle
b2d8c980e4 task failed sucessfully 2021-05-05 00:54:44 +01:00
timothyteakettle
f816bba62a bugfixes 2021-05-05 00:51:52 +01:00
timothyteakettle
fac2b259ac big changes 2 2021-05-03 22:43:45 +01:00
timothyteakettle
f4bb5255ab Revert "big changes"
This reverts commit 7ac50b7ba2.
2021-05-03 22:43:32 +01:00
timothyteakettle
7ac50b7ba2 big changes 2021-05-03 22:43:22 +01:00
Timothy Teakettle
93254f5d9c Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-02 22:20:57 +01:00
Timothy Teakettle
d32770a0fa test 2021-05-02 22:19:41 +01:00
Timothy Teakettle
2daed9250f some bugfixes 2021-05-02 18:30:35 +01:00
Timothy Teakettle
7efadade15 href fix 2021-05-01 20:55:13 +01:00
Timothy Teakettle
8aed1b4236 more color code 2021-05-01 20:37:22 +01:00
Timothy Teakettle
ddc3e3b3b2 Update preferences.dm 2021-05-15 21:24:20 +01:00
Timothy Teakettle
cb98cbd19f colour backend 2021-04-28 22:33:05 +01:00