kevinz000
|
3990b1f4c9
|
Merge pull request #11571 from Ghommie/Ghommie-cit635
Size preferences made configurable.
|
2020-03-23 10:37:54 -07:00 |
|
Ghommie
|
76ff0d4931
|
M/F body preferences.
|
2020-03-22 19:47:48 +01:00 |
|
Ghommie
|
b43f7c10be
|
Savefiles vs admin shenanigeans...
|
2020-03-22 04:30:45 +01:00 |
|
Ghommie
|
ebfa9d6b84
|
Very tentative attempt at figuring out what's wrong.
|
2020-03-22 04:21:00 +01:00 |
|
Ghommie
|
6d4433dd77
|
Size preferences made configurable.
|
2020-03-22 01:07:51 +01:00 |
|
Ghommie
|
6c6b2a42eb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit629
|
2020-03-21 15:04:35 +01:00 |
|
Ghommie
|
e6f40cce14
|
hex
|
2020-03-19 17:50:08 +01:00 |
|
Ghommie
|
eeab3ed11f
|
Everyday
|
2020-03-19 17:34:01 +01:00 |
|
Ghom
|
da7a979842
|
Merge branch 'master' into Ghommie-cit629
|
2020-03-19 17:15:26 +01:00 |
|
Ghommie
|
dd7046cbd1
|
no comment
|
2020-03-19 16:53:58 +01:00 |
|
Ghommie
|
bd9e195b11
|
shapes and sizes sanitized.
|
2020-03-19 16:41:19 +01:00 |
|
Ghommie
|
8ccd0d2cbc
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit595
|
2020-03-12 20:31:14 +01:00 |
|
Ghom
|
c771471895
|
Merge pull request #11406 from kevinz000/minimaps
Ports station minimaps from Yogstation thank you monster860 you are an epic gamer
|
2020-03-12 14:18:39 +01:00 |
|
kevinz000
|
14b22f0b67
|
Merge remote-tracking branch 'citadel/master' into minimaps
|
2020-03-11 17:32:15 -07:00 |
|
kevinz000
|
69c21f4b76
|
Merge pull request #10327 from Seris02/tggenetics
ports tg genetics
|
2020-03-11 17:01:37 -07:00 |
|
kevinz000
|
269b7c2939
|
k
|
2020-03-09 21:06:00 -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 |
|
Ghom
|
8878733fc1
|
Merge pull request #11317 from deathride58/WEPORTINSYNTHSBOI
Ports Skyrat's synths (Plus limb rendering overhaul and more)
|
2020-03-09 00:26:06 +01:00 |
|
deathride58
|
2e35c09dec
|
Merge pull request #10451 from kevinz000/mobility_flags
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
|
2020-03-05 20:03:56 -05:00 |
|
Ghommie
|
2cbdae2f0a
|
Made flavor texts into an element datum.
|
2020-03-05 18:46:33 +01:00 |
|
Ghom
|
5e4f8dc6a0
|
Merge pull request #11181 from Detective-Google/big-chode-energy
changes sausage girth from circumference -> diameter
|
2020-03-04 23:49:58 +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 |
|
kevinz000
|
1e99cd0bfe
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-03-03 03:08:41 -07:00 |
|
Ghommie
|
31bde973e0
|
Bad.
|
2020-02-29 15:44:05 +01:00 |
|
Ghommie
|
bcc1c954c8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit595
|
2020-02-29 15:16:43 +01:00 |
|
Ghommie
|
bd87d46ce6
|
Deletes the preferences_vore datum and migrates its contents to preferences.
|
2020-02-29 15:07:44 +01:00 |
|
Detective-Google
|
1f88a22d04
|
Merge branch 'master' into big-chode-energy
|
2020-02-27 16:39:57 -06:00 |
|
Detective Google
|
b7aad30d3c
|
girth -> diameter
|
2020-02-27 16:38:14 -06:00 |
|
Ghom
|
d85563367e
|
Whoopsie
|
2020-02-27 12:39:01 +01:00 |
|
Ghommie
|
a91464bf64
|
Fixing escaped characters in flavor texts.
|
2020-02-27 02:29:44 +01:00 |
|
Seris02
|
c3ec44b0d0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-02-22 19:54:10 +08:00 |
|
kevinz000
|
0e4692c63d
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-18 18:16:34 -07:00 |
|
kevinz000
|
9dbc6ca183
|
Update client_procs.dm
|
2020-02-17 22:37:58 -07:00 |
|
Seris02
|
2d9c8ce8fc
|
fixing merge conflicts
|
2020-02-15 15:41:52 +08:00 |
|
Ghommie
|
315b0a9645
|
Fixes halved flavor text max length and removing some crappy code.
|
2020-02-13 14:05:40 +01:00 |
|
kevinz000
|
eca0e0f2dc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-13 00:39:20 -07:00 |
|
kevinz000
|
cda01e10f6
|
Merge pull request #10885 from Ghommie/Ghommie-cit553
Removing a couple troublesome NSFW useless and unused preferences.
|
2020-02-05 23:45:30 -07:00 |
|
Seris02
|
ee7064840d
|
merge conflicts fixed finally
|
2020-02-05 18:42:16 +08:00 |
|
kevinz000
|
6a8a606f97
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-04 16:01:25 -07:00 |
|
Ghom
|
c24ffa8f1c
|
Merge pull request #10840 from Putnam3145/easier_bunker
Save panic bunker between rounds
|
2020-02-04 21:15:37 +01:00 |
|
Ghommie
|
0eb5aa0a2a
|
Removing a couple troublesome NSFW unused prefs.
|
2020-02-04 04:58:09 +01:00 |
|
Artur
|
e7ddfdd8d8
|
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
|
2020-02-02 13:31:54 +01:00 |
|
kevinz000
|
33577e0d82
|
Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
|
2020-02-02 01:47:24 -07:00 |
|
Putnam
|
aba0379bfb
|
also need these!
|
2020-02-01 08:53:19 -08:00 |
|
Putnam
|
463036a4f4
|
made panic bunker save in json
|
2020-02-01 08:44:05 -08:00 |
|
Artur
|
54cd2585cf
|
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
|
2020-01-31 23:18:51 +01:00 |
|
Ghommie
|
188f726ffd
|
unicode support port wip
|
2020-01-31 05:32:00 +01:00 |
|
Arturlang
|
83ce84cdc4
|
Merge branch 'master' into TGUIs_Nexties
|
2020-01-30 20:46:20 +02:00 |
|
Ghom
|
d92a67f582
|
I'm sorry what?
|
2020-01-30 18:08:43 +01:00 |
|