Timothy Teakettle
|
c3e9cdd9a5
|
finale
|
2020-12-26 23:09:19 +00:00 |
|
silicons
|
803bff4e5f
|
funny
|
2020-11-12 23:34:42 -07:00 |
|
Tupinambis
|
3224533a7c
|
Merge branch 'master' into spooder
|
2020-10-11 14:31:23 -05:00 |
|
silicons
|
7f611a98e1
|
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
|
2020-10-10 22:23:22 -07:00 |
|
silicons
|
737b6460af
|
Merge pull request #13497 from Zandario/species-refactor
Refactors some defines for easier Species Development
|
2020-10-10 22:00:49 -07:00 |
|
Timothy Teakettle
|
385bd57940
|
reworks family heirlooms, adds heirlooms that can be based off your species (#13444)
* corgi tracker
* better heirloom system
* typo
|
2020-10-10 12:15:39 +02:00 |
|
silicons
|
1b1efce556
|
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
|
2020-10-06 17:11:21 -07:00 |
|
Timothy Teakettle
|
05aef528d7
|
finishing touches
|
2020-10-04 17:33:46 +01:00 |
|
Timothy Teakettle
|
b48f4b91e6
|
Merge branch 'master' into eye-sprites
|
2020-10-04 01:23:03 +01: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 |
|
Zandario
|
1620e3887c
|
Merge branch 'master' into species-refactor
|
2020-10-02 17:19:48 -05:00 |
|
Zandario
|
bdd121cd81
|
Prep Work
|
2020-10-02 17:17:50 -05:00 |
|
timothyteakettle
|
318729031c
|
newlines good for the soul
|
2020-10-02 14:55:39 +01:00 |
|
timothyteakettle
|
158b1d584f
|
woopsy
|
2020-10-02 14:54:57 +01:00 |
|
timothyteakettle
|
3ba9031fe2
|
Revert "gender part support"
This reverts commit 358041c2ef.
|
2020-10-02 14:54:05 +01:00 |
|
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 |
|
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
|
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 |
|
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 |
|