Commit Graph

707 Commits

Author SHA1 Message Date
silicons
ec63a4c62b Merge pull request #14779 from Arturlang/Orbit_menu_antags
Makes orbit menu show antags if DNR
2021-06-09 11:17:14 -07:00
Arturlang
84db564e0f Prettier? code 2021-06-01 02:25:06 +03:00
Arturlang
4b541d3dac phonecode 2021-06-01 02:21:33 +03:00
Artur
8687312935 Makes orbit menu show antags if DNR 2021-05-31 18:14:06 +03:00
zerothebigboy
7dea33f6c2 doge 2021-05-27 16:08:28 -04:00
zerothebigboy
25c99bb23c fuckihatecoding 2021-05-22 11:52:55 -04:00
zerothebigboy
37c3bc23a8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hair
# Conflicts:
2021-05-22 07:21:02 -04:00
silicons
acdb57b0d1 Merge pull request #14739 from WanderingFox95/WanderingFox95-Ears
A small ear related PR (Deer ears, Rabbit ears)
2021-05-22 01:37:05 -06:00
zerothebigboy
af24fef322 inari 2021-05-21 20:46:48 -04:00
zerothebigboy
f54c893748 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hair 2021-05-20 18:57:51 -04:00
WanderingFox95
0294ddb2a6 Apply suggestions from code review
Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
2021-05-19 13:01:13 +02:00
WanderingFox95
4cd8cbd3e4 Same changes for the non human section of the ear file.
consistency.
2021-05-19 12:27:32 +02:00
WanderingFox95
eab45f0d64 Apply suggestions from code review
They're very fair.

Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
2021-05-19 09:48:38 +02:00
zerothebigboy
e7c0dea497 actually an eris hairdo 2021-05-18 22:04:59 -04:00
zerothebigboy
89b2d74895 actually an eris hairdo 2021-05-18 22:00:35 -04:00
WanderingFox95
808e94899f Ear Adjustments 2021-05-19 01:38:28 +02:00
zeroisthebiggay
55383e0387 Update hair_head.dm 2021-05-18 17:27:59 -04:00
zerothebigboy
20ac75020d steponmycock 2021-05-18 17:23:07 -04:00
zeroisthebiggay
cc29443b53 Update hair_head.dm 2021-05-18 17:06:20 -04:00
zerothebigboy
2a3eb07bfd steponmycock 2021-05-18 16:57:52 -04:00
timothyteakettle
34869215e8 Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-14 01:59:32 +01:00
Timothy Teakettle
6095b4724f fixes fox markings legs 2021-05-10 01:54:24 +01:00
zerothebigboy
181dcc347b cum sex balls penis 2021-05-09 04:34:25 -04:00
timothyteakettle
bef9473fa1 more migration fixes and general bugfixes 2021-05-07 16:10:20 +01:00
timothyteakettle
b1f84f94db Update body_markings.dm 2021-05-06 22:43:31 +01:00
timothyteakettle
80599201cf better fix 2021-05-06 22:39:07 +01:00
timothyteakettle
cb12843a34 bugfix 2021-05-06 22:35:15 +01:00
Timothy Teakettle
d39a60dd6b casually list the matrixes for several hundred sprites 2021-05-05 21:24:07 +01:00
Timothy Teakettle
ea071bd031 comment 2021-05-05 18:28:55 +01:00
Timothy Teakettle
ba71bb944a im not crazy but this commit breaks 90% of the game 2021-05-05 18:11:05 +01:00
timothyteakettle
7265c7111c new limb covering var for markings 2021-05-03 22:47:22 +01:00
timothyteakettle
2f5cb63994 who deleted this 2021-04-28 17:37:09 +01:00
Putnam
3760be44d9 Added observe logging 2021-03-30 20:41:48 -07:00
silicons
4f631c29bb Merge pull request #14504 from zeroisthebiggay/tritails
i hate kitsune players so here i am porting triple kitsune tails from VORE fuck you
2021-03-27 01:34:23 -06:00
Timothy Teakettle
14ba2b3da1 OOPS 2021-03-23 22:40:27 +00:00
zerothebigboy
f600e51408 i hate kitsune players so i hope you appreciate me adding more cringe to your arsenal 2021-03-23 15:50:13 -04:00
Adelphon
56cccc2ca3 new hair 2021-03-10 18:14:07 -05:00
Letter N
889802a376 a 2021-03-03 14:16:36 +08:00
Letter N
4b62633fd8 a 2021-03-03 14:11:38 +08:00
Letter N
6514f4034c a 2021-03-02 12:57:26 +08:00
Letter N
364381937f fix+disallows admins rigging votes 2021-03-02 10:18:30 +08:00
Letter N
09ce499146 aeiou 2021-03-01 21:55:34 +08:00
Letter N
59990abd25 grr 2021-02-27 08:41:54 +08:00
Letter N
6abad913ff the sqel 2021-02-19 14:52:18 +08:00
Letter N
7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
timothyteakettle
b2588c5d57 Update new_player.dm 2021-02-14 02:11:07 +00:00
silicons
993a849700 Merge pull request #14155 from SmArtKar/tgui_observe
Port of TG's "Auto Observe"
2021-02-04 12:49:09 -07:00
zerothebigboy
0bc3c5292c arooga 2021-01-28 12:31:23 -05:00
SmArtKar
a7bc066891 Auto-Observe! 2021-01-28 17:09:28 +03:00
silicons
a973a3b088 Merge pull request #14145 from zeroisthebiggay/aeughfuck
ports some hairstyles from rp because god knows we need some good hairs that aren't Short Hair 3 and Wisp
2021-01-27 19:08:25 -07:00