cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-26 09:44:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,604 Commits 55 Branches 0 Tags
901b93e534a880bb2b014dbbd5f80c149e6ec01a
Commit Graph

405 Commits

Author SHA1 Message Date
Letter N
5db87b9065 more updates! 2021-02-12 17:52:59 +08:00
Letter N
f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
SandPoot
c2b2808acb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-29 14:43:00 -03:00
Timothy Teakettle
a7445316ef Update flavor_misc.dm 2021-01-28 02:11:08 +00:00
Timothy Teakettle
337611a372 Merge remote-tracking branch 'upstream/master' into caw-and-gekker 2021-01-28 02:10:11 +00:00
Timothy Teakettle
e130e9c7e2 Update flavor_misc.dm 2021-01-28 02:08:19 +00:00
SandPoot
67ad6cbbb8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-15 19:03:13 -03:00
The0bserver
ffe401544c First wave of fixing 2021-01-13 23:35:37 -05:00
SandPoot
c79e8434cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-08 11:31:10 -03:00
shellspeed1
98f8af853c Minor xenohybrid changeschanges 
Adds wings, xeno tongue, and makes xenomorphs speak xenohybrid by default
 2021-01-06 01:58:58 -08:00
SandPoot
168799038d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-04 02:05:26 -03:00
Timothy Teakettle
c3e9cdd9a5 finale 2020-12-26 23:09:19 +00:00
SandPoot
af0f6e7bd0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-18 23:12:54 -03:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
SandPoot
4c73583f75 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-11 21:30:33 -03:00
Tupinambis
3224533a7c Merge branch 'master' into spooder 2020-10-11 14:31:23 -05:00
SandPoot
8aad78b784 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-11 02:44:06 -03:00
SandPoot
7181e558b3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-11 02:42:29 -03: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
SandPoot
273ad286d5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-10 14:43:38 -03: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
SandPoot
08f8360f31 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-06 23:10:33 -03:00
silicons
1b1efce556 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-06 17:11:21 -07:00
Timothy Teakettle
9fb18f8b9f language tab 2020-10-06 22:34:17 +01: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
SandPoot
1c14536bb5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-03 18:54:30 -03: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
Enric Gabriel
c27b799fc6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-01 21:16:19 -03: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
Enric Gabriel
7df07d2859 Merge branch 'master' of upstream into master 2020-10-01 12:49:01 -03: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
SandPoot
78b897c81c Adds a watch and fixes liteweb ui (#79) 2020-09-28 19:35:42 -03:00
Enric Gabriel
28f2ea53b0 Revert "upload files" 
This reverts commit f0a97d4b69.
 2020-09-28 19:12:43 -03:00
Enric Gabriel
f0a97d4b69 upload files 2020-09-28 19:10:40 -03:00
silicons
822f1c9bf3 fix 2020-09-27 03:07:51 -07:00
SandPoot
13834c4bef Morrowinventory Port (#75) 2020-09-24 20:14:53 -03:00