Commit Graph

582 Commits

Author SHA1 Message Date
Enric Gabriel d85ebed8db Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-16 16:22:36 -03:00
Enric Gabriel 242400a5d6 push the files 2020-09-07 20:40:03 -03:00
timothyteakettle cdaef63fa1 sorry travis 2020-09-03 23:07:19 +01:00
timothyteakettle 90eef6efc9 Merge remote-tracking branch 'upstream/master' into limbs 2020-09-03 22:46:32 +01:00
timothyteakettle 4f82f063db dummies 2020-09-03 22:09:50 +01:00
timothyteakettle 9e2ee588c9 rp prosthetics 2020-09-03 22:05:21 +01:00
Enric Gabriel c10471fac9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-30 01:42:29 -03:00
Letter N ae482c1bb8 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-29 14:09:56 +08:00
Enric Gabriel 0db4397e7c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-27 14:07:17 -03:00
Timothy Teakettle be22486913 this hurt to do manually 2020-08-24 19:55:10 +01:00
timothyteakettle cd7293a9a2 limbs 2020-08-24 03:19:36 +01:00
Enric Gabriel f759503b49 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-22 20:30:49 -03:00
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
Letter N 7a7a6fbe68 asset moment. 2020-08-22 16:41:13 +08:00
Enric Gabriel 9eb03e17d5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-20 00:00:15 -03:00
Enric Gabriel 600c3b3528 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-18 23:31:57 -03: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
Enric Gabriel 4e7312d276 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-14 15:07:53 -03: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
Enric Gabriel 7929924d4a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-11 13:04:34 -03:00
silicons b16f920479 Merge pull request #13086 from ArchieBeepBoop/dev
Add Skulldog Snout
2020-08-11 01:44:29 -07:00
silicons 035422ed7f Merge pull request #13098 from LetterN/ToS-component
Mafia Component
2020-08-11 01:41:13 -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
Enric Gabriel b351a5ecb8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-10 12:05:05 -03:00
silicons 375f740d8b sigh 2020-08-10 04:52:33 -07:00
silicons 3795bcf2d0 Merge pull request #13097 from zeroisthebiggay/yessalthairpr
Patented Zero Salt PR That Adds One New Hair Style That Is Just Pompadourless Volaju Because
2020-08-10 02:29:47 -07:00
Letter N a4040ace26 hewwo have you tried to work? 2020-08-10 10:50:07 +08:00
Enric Gabriel bae8c236f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-09 18:34:33 -03:00
ArchieBeepBoop 950c8fb8be Merge pull request #2 from ArchieBeepBoop/master
Update Dev Branch
2020-08-09 13:23:25 -03: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
Letter N 333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
Enric Gabriel d82cb8b9e8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-03 17:03:13 -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
Letter N b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Letter N 0805265412 yet another batch. MAJOR: APC 2020-07-30 12:54:53 +08:00
Enric Gabriel e0fdf3dce9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 / merge conflicts 2020-07-23 19:14:58 -03:00
Timothy Teakettle 974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01: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
Enric Gabriel 05593f84a0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-16 22:13:13 -03:00