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-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,274 Commits 55 Branches 0 Tags
afe32406c0d0ff6de6225d4409e5cad8a13e00df
Commit Graph

70 Commits

Author SHA1 Message Date
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
timothyteakettle
1f240b883f holy shit 2020-08-11 03:37:04 +01:00
Timothy Teakettle
9ac3214200 so i cant even spell huh 2020-08-07 21:41:32 +01:00
Timothy Teakettle
f32230a1f2 we have two procs that do a similar thing wow 2020-08-07 21:38:21 +01:00
Timothy Teakettle
e329950008 dna is shit 2020-08-07 21:35:19 +01:00
silicons
03f0d76a8e yeah ok 2020-07-23 13:23:45 -07:00
Artur
84a22a9f49 Fixes cloning species transfer 2020-07-09 23:06:57 +03:00
Artur
280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
Weblure
bc76fa615d Fixed small strides formula 2020-07-03 17:05:56 -07:00
Artur
40e54650c7 Compile 2020-06-01 10:26:48 +03:00
Artur
19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00
Ghom
cea958f822 Fixing various issues. (#12368) 
* Fixing various issues.

* Lights.
 2020-05-28 00:36:57 -07:00
Artur
9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
Ghom
75dec8ce2c Ports "Removes the absolute istype fest from footsteps" (#12259) 
* Ports "Removes the absolute istype fest from footsteps"

* Update species.dm
 2020-05-18 04:46:22 -07:00
Artur
dabdf16eac Coonflict fiiixeeess 2020-05-13 12:56:17 +03:00
Artur
5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
kevinz000
40d2d35ffa Merge pull request #12205 from Ghommie/Ghommie-cit741 
A few runtimes, fixed.
 2020-05-12 12:27:45 -07:00
Ghommie
46ba884965 A few runtimes, fixed. 2020-05-10 23:47:30 +02:00
Ghommie
2858ddd90b Porting "Refactors language holder" 2020-05-08 22:44:02 +02:00
kevinz000
d9b6ea5181 Merge pull request #11847 from Ghommie/Ghommie-cit679 
A peeve with random bodies.
 2020-04-25 16:59:07 -07:00
Artur
321902c35a Ports https://github.com/tgstation/tgstation/pull/50225 2020-04-23 13:28:09 +03:00
Ghommie
63870cc9d1 Movespeed modifiers refactor port. 2020-04-22 22:01:39 +02:00
Ghommie
571584901c Custom skin tone preferences. 2020-04-14 19:10:28 +02:00
Ghom
55402b1834 Merge branch 'master' into Ghommie-cit679 2020-04-14 16:22:00 +02:00
Ghommie
e753c1ad14 Fixed a little peeve with random bodies. 2020-04-14 02:20:19 +02:00
Ghommie
fe4b270568 Sprite size preferences?! Oh no! 2020-04-12 05:08:49 +02:00
Ghom
1eb25e4880 Update dna.dm 2020-03-26 23:56:01 +01:00
Ghommie
76ff0d4931 M/F body preferences. 2020-03-22 19:47:48 +01:00
kevinz000
6127f6a453 k 2020-03-11 17:41:12 -07:00
kevinz000
69c21f4b76 Merge pull request #10327 from Seris02/tggenetics 
ports tg genetics
 2020-03-11 17:01:37 -07:00
Ghommie
0587d3482d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit604 2020-03-09 21:53:22 +01:00
Seris02
cccd0e9eef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-03-09 16:49:32 +08:00
Ghommie
2cbdae2f0a Made flavor texts into an element datum. 2020-03-05 18:46:33 +01:00
deathride58
49ad376e5e Adds a very basic soft restriction system. There's definite room for improvement, but this is good enough for now. Am too hongry for this. 2020-03-03 17:44:10 -05:00
Seris02
ee7064840d merge conflicts fixed finally 2020-02-05 18:42:16 +08:00
Ghommie
188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
Ghommie
56d31b0c8c neuter/plural gender fixes. 2020-01-23 22:50:30 +01:00
Seris02
16b5c83a3a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-01-13 12:53:52 +08:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Seris02
daa86dcc1a does a fix 2019-12-28 22:02:17 +08:00
Seris02
862acf2f06 ports hyper's genetics 2019-12-28 21:33:15 +08:00
Ghommie
3545f10137 Fixing character setup preview icons. 2019-12-12 17:04:14 +01:00
Ghommie
1e669f25a4 Fixes identity transfer not copying digi legs. 2019-10-20 13:43:35 +02:00
Ghommie
490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
Poojawa
f767069dc2 Custom Species names 2019-04-15 13:50:21 -05:00
deathride58
781a15c81e adds the ability to mark your character as nameless 2019-02-21 06:19:43 -05:00
Poojawa
b6430559e9 datums 2018-09-11 02:49:41 -05:00
deathride58
fea27b5613 Adds citadel snowflake features as UE blocks (#7372) 
* adds mutcolor, mutant parts, and taur parts as proper UI blocks

* i didnt fucking ctrl+s
 2018-07-20 03:42:11 -07:00
deathride58
2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00