Commit Graph

315 Commits

Author SHA1 Message Date
Putnam3145 cbb6020d49 Merge pull request #13553 from timothyteakettle/eye-sprites
fixes eye sprites up
2020-10-11 11:56:08 -07:00
Timothy Teakettle 89f2c53d88 ignore those reverts 2020-10-11 18:23:56 +01:00
Timothy Teakettle 5aff38597f Revert "Revert "Revert "Revert "customizable eyes""""
This reverts commit d852aacb78.
2020-10-11 17:11:01 +01:00
Timothy Teakettle d852aacb78 Revert "Revert "Revert "customizable eyes"""
This reverts commit dedfdf224d.
2020-10-11 16:55:07 +01:00
Timothy Teakettle dedfdf224d Revert "Revert "customizable eyes""
This reverts commit 9f3d745d80.
2020-10-11 16:54:53 +01:00
Timothy Teakettle b76b97fbe9 Revert "Revert "eyes""
This reverts commit 4526fef297.
2020-10-11 16:54:50 +01:00
Timothy Teakettle 4526fef297 Revert "eyes"
This reverts commit 0c99b53c05.
2020-10-11 16:54:12 +01:00
Timothy Teakettle 9f3d745d80 Revert "customizable eyes"
This reverts commit dc70d17a1e.
2020-10-11 16:54:09 +01:00
silicons 19f1e99a8c mass ports like 15 tg prs + counting (#13386)
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2020-10-10 12:20:33 +02:00
timothyteakettle dc70d17a1e customizable eyes 2020-10-04 01:19:29 +01:00
Timothy Teakettle 0c99b53c05 eyes 2020-10-03 23:22:53 +01:00
Tupinambis d2860b38c7 normalization 2020-10-01 18:46:31 -05:00
Tupinambis f1bc1ccafb Merge branch 'master' into spooder
# Conflicts:
#	code/modules/surgery/organs/eyes.dm

I have no idea if this will work
2020-10-01 17:10:42 -05:00
silicons fba8bfbf4f Merge pull request #13467 from Putnam3145/past-me-idiot
Fixes vore prefs (I was looking in the wrong place the whole time)
2020-10-01 03:10:04 -07:00
silicons 46a80af956 Merge pull request #13317 from LetterN/what-if-the-savefile-itself-is-teakproof-questionmark_charachter
Ports tgstation/tgstation#52549
2020-10-01 02:56:39 -07:00
Tupinambis 0bb889932d Completed! 2020-09-30 19:05:56 -05:00
Tupinambis 113b84ab50 Ports arachnids from WaspStation 2020-09-30 15:10:17 -05:00
Putnam c644495e5e dodgin bullets 2020-09-29 21:07:41 -07:00
Putnam 0c7003b3a5 never code while tired 2020-09-29 20:37:48 -07:00
Putnam f8200a5838 Shitcode fixing inop code. 2020-09-29 06:40:09 -07:00
Timothy Teakettle 783c33067b typo moment 2020-09-28 22:13:33 +01:00
Timothy Teakettle 106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01:00
timothyteakettle 2bb19003a0 thanks kevin 2020-09-07 01:47:30 +01:00
Timothy Teakettle 4bbec8eae1 travis lets be friends 2020-09-04 12:45:23 +01:00
timothyteakettle fc0e8e31fc yeah dont brick data again holy shit 2020-09-03 22:51:56 +01:00
timothyteakettle 90eef6efc9 Merge remote-tracking branch 'upstream/master' into limbs 2020-09-03 22:46:32 +01:00
timothyteakettle 594fd17f23 test 2020-09-02 15:34:13 +01:00
Letter N ceea4f07ea tested? no 2020-08-31 10:43:03 +08:00
timothyteakettle a9ec2254ba hide your ckey 2020-08-31 01:47:49 +01:00
Timothy Teakettle 1d943a34ef heterochromia 2020-08-28 18:30:28 +01:00
Timothy Teakettle fe25046410 Merge branch 'master' into limbs 2020-08-27 18:06:35 +01:00
Timothy Teakettle bc2c658395 json 2020-08-27 18:01:08 +01:00
silicons 857c581931 Merge pull request #13232 from timothyteakettle/is-this-a-good-idea
adds the ability to pick body sprites (you can choose aquatic/avian sprites as anthromorphs!)
2020-08-27 09:55:26 -07:00
timothyteakettle cd7293a9a2 limbs 2020-08-24 03:19:36 +01:00
timothyteakettle 613880b9b0 saves and moths 2020-08-21 23:32:43 +01:00
Timothy Teakettle 88fb9d277a fix lizard snouts (#13223) 2020-08-20 22:58:54 +02:00
timothyteakettle 8b4fb136b2 ok fuck it 2020-08-14 02:37:08 +01:00
timothyteakettle a9caceb001 insect fluff! 2020-08-14 02:27:54 +01:00
Timothy Teakettle e5d48e307a woops 2020-08-12 17:04:37 +01:00
Timothy Teakettle 82298fd56c yes 2020-08-12 17:03:23 +01:00
Lin 02add89513 Merge pull request #12846 from Citadel-Station-13/silicons-patch-42
it would be real lovely if the server didn't nuke 40 people's characters because the configuration couldn't be loaded because i really hate dll memes
2020-07-23 13:29:18 -05:00
Lin 6fca9af0ed Merge pull request #12848 from silicons/morecolors
species customization now allows 16 million colors instead of 4 thousand
2020-07-23 13:28:50 -05:00
silicons 87d53957bf sigh 2020-07-20 20:09:13 -07:00
silicons 4832069181 Update preferences_savefile.dm 2020-07-20 18:57:09 -07:00
Timothy Teakettle a4478b0cda it continues 2020-07-17 22:38:28 +01:00
silicons 22c3d9fe3e ok 2020-07-07 21:07:13 -07:00
Ghom 4354b0bf6f Actually fixing a dum dum feature. 2020-07-02 19:26:52 +02:00
silicons 5f11612078 Update preferences_savefile.dm 2020-07-02 03:00:35 -07:00
Timothy Teakettle 97dbd9cedf better customization 2020-06-24 21:44:48 +01:00
deathride58 513ed1ab47 Fixes a major HTML injection vulnerability with flavortext by making flavortext store itself as encoded html instead of decoded html (#12513) 2020-06-12 15:17:32 -07:00