615 Commits

Author SHA1 Message Date
timothyteakettle 358041c2ef gender part support 2020-10-02 14:50:42 +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 1f4e3b9a92 Merge branch 'master' into patch-2 2020-10-01 03:09:38 -07:00
Tupinambis a3a5fe4c2d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into spooder 2020-09-30 16:07:21 -05:00
Tupinambis 8828440575 fix 2020-09-30 16:06:56 -05:00
Tupinambis 113b84ab50 Ports arachnids from WaspStation 2020-09-30 15:10:17 -05:00
zeroisthebiggay 40f404498d ok
ok
2020-09-29 18:51:28 -04:00
silicons 822f1c9bf3 fix 2020-09-27 03:07:51 -07:00
Blue Wildrose fe712d7e52 traviiiiiis 2020-09-22 20:14:14 -07:00
Blue Wildrose e920e2855c travis please 2020-09-22 19:23:18 -07:00
Blue Wildrose 3e8572e5e2 Requested by Teak because they didn't want to make a PR for this 2020-09-22 19:10:24 -07:00
silicons 3505a5bc18 fixes 2020-09-20 02:10:54 -07:00
silicons 8ebe765d70 fixes 2020-09-20 02:03:18 -07: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
silicons 10fdc4427a Merge pull request #13305 from Tupinambis/maintloot2
Removes growth pills and genital autosurgeons from the maint loot table. Shoves them in the kinkmates.
2020-08-31 21:21:46 -07:00
Tupinambis 39eac62dcd moves growth pills and genital autosurgeons to the kinkmate 2020-08-29 23:35:35 -05:00
silicons 50cf863501 Merge pull request #13263 from raspy-on-osu/tesla-groundingrodspull
Tesla Counterplay.
2020-08-29 21:24:41 -07: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 f908475617 rock paper scissors 2020-08-26 01:01:09 +01:00
raspy-on-osu 580afaf74a init
first attempt
2020-08-24 20:29:25 -04:00
timothyteakettle e4b695f261 stop being invisible 2020-08-21 23:42:54 +01:00
timothyteakettle a75d91299a yep 2020-08-21 23:16:44 +01:00
Timothy Teakettle b953622e6f FUCK 2020-08-21 22:14:50 +01:00
Timothy Teakettle cbe9d05fb6 fuck 2020-08-21 21:08:17 +01:00
timothyteakettle 47424be1c0 tail fix 2020-08-18 00:46:05 +01:00
Timothy Teakettle f5300750b5 Revert "[TESTMERGE ONLY] FUCK" 2020-08-17 03:18:36 +01:00
silicons 4cd731ce11 Revert "cease your shitcode: cum edition" 2020-08-16 19:06:57 -07:00
silicons 8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
silicons b56742beb5 Merge branch 'pr-13110' 2020-08-16 18:40:23 -07:00
silicons 428bb936aa Merge pull request #13037 from timothyteakettle/freedom-in-customisation
turns 304 lines of snowflake code into 24 lines
2020-08-16 18:35:05 -07:00
timothyteakettle a9caceb001 insect fluff! 2020-08-14 02:27:54 +01:00
timothyteakettle 1f240b883f holy shit 2020-08-11 03:37:04 +01:00
kiwedespars eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
Timothy Teakettle 033fe553e8 cease your shitcode 2020-08-10 21:41:06 +01:00
Timothy Teakettle ce0a5b7016 only horns is unlocked now 2020-08-08 15:26:25 +01:00
Putnam 9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
silicons 3640a33ff6 e 2020-08-06 23:22:53 -07:00
silicons bcfc601c7a sigh 2020-08-06 23:11:09 -07:00
silicons 8edb374a20 sigh 2020-08-06 23:09:02 -07:00
Timothy Teakettle f2c1b25119 yes 2020-08-05 15:50:25 +01:00
Timothy Teakettle 5297700340 snowflake coders are bad 2020-08-05 14:11:40 +01:00
Timothy Teakettle 7c8f03a81f new defines 2020-08-01 18:29:27 +01:00
Timothy Teakettle 31963b32a4 subcategories cool 2020-07-29 17:14:07 +01:00
timothyteakettle c15d0de20d subcategories work 2020-07-29 03:57:16 +01:00
silicons 04df84d1e0 Merge pull request #12776 from timothyteakettle/snail-shells
snail shell backpack
2020-07-17 17:07:46 -07:00
Timothy Teakettle 0a4a0fadb3 snails 2020-07-14 20:59:25 +01:00
Timothy Teakettle 55af5f8ea2 give me my snails 2020-07-14 20:26:31 +01:00
Artur a304ed7f49 Canister and paper updates
should fix papah exploits, though some runtiming is occuring
2020-07-04 16:14:42 +03:00