Commit Graph

331 Commits

Author SHA1 Message Date
silicons
68ee7b12bf Merge pull request #13236 from timothyteakettle/lizard-fixes
lizards are shitcode
2020-08-22 15:19:48 -07:00
Timothy Teakettle
60c8dd283e shitcode begone 2020-08-22 20:02:36 +01:00
timothyteakettle
b40a42209d fixes two snout paths 2020-08-19 03:19:51 +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
Lin
2fa0b4ae6c Merge pull request #13105 from silicons/underwear_412
ports binder bras from rp
2020-08-14 13:03:25 -05:00
Timothy Teakettle
4a2bbe66d6 Merge branch 'master' into cum 2020-08-11 18:30:30 +01:00
silicons
b16f920479 Merge pull request #13086 from ArchieBeepBoop/dev
Add Skulldog Snout
2020-08-11 01:44:29 -07:00
timothyteakettle
b9efa05ec4 double FUCK 2020-08-11 03:40:41 +01:00
timothyteakettle
84a8585055 FUCK 2020-08-11 03:38:25 +01:00
timothyteakettle
1f240b883f holy shit 2020-08-11 03:37:04 +01:00
silicons
375f740d8b sigh 2020-08-10 04:52:33 -07:00
zerothebigboy
822c17e444 a 2020-08-09 08:07:40 -04:00
Dip
ab2de2e55c Added Skulldoggo Snout 2020-08-08 16:01:37 -03:00
Seris02
82790cffed fixes lizard code 2020-08-03 21:39:11 +08:00
Seris02
aeec3a3404 lizards no longer have broken spines 2020-08-03 17:29:32 +08:00
timothyteakettle
e8fade4f7f changes 2020-07-18 02:29:12 +01:00
Timothy Teakettle
a4478b0cda it continues 2020-07-17 22:38:28 +01:00
silicons
6634e43be4 fix 2020-07-07 07:41:33 -07:00
silicons
cee15792b7 ok 2020-07-07 07:25:10 -07:00
Ghommie
ae053a9a08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800 2020-06-23 03:12:49 +02:00
deathride58
245bf750c7 fixes a pair of dos vectors. this is apparently a day -1 patch! (#12511) 2020-06-12 11:54:18 -07:00
ynot01
ab3799ae7a Ports cornrows hairstyles from yogstation (#12423) 2020-06-02 15:29:07 -07:00
Rohesie
5ab8d41d9a horns (#12384) 2020-05-30 03:25:27 +02:00
Ghommie
a7934f3f88 event. 2020-05-29 18:58:34 +02:00
Kraseo
a7053a978f Ports a tail from the RP server (#12301)
* tailse

* forgot to reorder it lol

* and i guess felinids and anthros can use it too
2020-05-20 18:37:38 -07:00
Ghom
d16c97f06b Taur fixes. (#12248) 2020-05-15 07:16:09 -07:00
Ghommie
6666c651d5 Fixing IPCs and synth lizard antennas not showing up. 2020-05-10 03:06:39 +02:00
kevinz000
888f0a932f Merge pull request #12124 from Ghommie/Ghommie-cit725
Makes wings/horns colors dna features instead of human variables
2020-05-07 09:10:08 -07:00
kevinz000
3397c2284a Merge pull request #12128 from Citadel-Station-13/Ghommie-patch-1
Webedit PR fixing a few sprite accessories.
2020-05-06 08:35:08 -07:00
Ghom
13eeffbf27 Update wings.dm 2020-05-06 17:19:52 +02:00
Ghom
d13ed03861 Update tails.dm 2020-05-06 17:18:03 +02:00
Ghom
9c31a89fde Update spines.dm 2020-05-06 17:15:50 +02:00
Ghom
7477878062 Update snouts.dm 2020-05-06 17:12:15 +02:00
Ghom
b36e44d983 Merge branch 'master' into Ghommie-cit724 2020-05-05 23:32:51 +02:00
Ghommie
ccfce7cb64 Makes wings/horns colors dna features instead of human defines 2020-05-05 06:22:58 +02:00
Ghommie
3de0e545c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-05-05 05:44:55 +02:00
Ghommie
86c80dbbd9 Fixes felinid's cat ears and removes two unused variables. 2020-05-04 18:20:10 +02:00
Ghommie
cd642aff73 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-05-01 22:12:00 +02:00
Ghommie
a1f252d558 Fixing several reported issues. 2020-05-01 19:48:27 +02:00
kevinz000
464fcd02cd Merge remote-tracking branch 'citadel/master' into skills 2020-04-25 22:18:08 -07:00
kevinz000
d9b6ea5181 Merge pull request #11847 from Ghommie/Ghommie-cit679
A peeve with random bodies.
2020-04-25 16:59:07 -07:00
kevinz000
e6b0fb4929 this was a mistake 2020-04-25 01:02:47 -07:00
Lin
df4452468a Merge pull request #11932 from Ghommie/Ghommie-cit695
Some mispelled filepaths.
2020-04-22 16:09:33 +00:00
Ghommie
e6d777584f Eh? 2020-04-21 20:49:49 +02:00
Ghom
a2c796f943 Update legs_and_taurs.dm 2020-04-21 18:53:53 +02:00
Ghommie
5a4fecdeb8 tested and it works now, I'm glad. 2020-04-20 19:22:42 +02:00
Ghommie
e703e12c88 WIP 2020-04-20 16:25:08 +02:00