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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Ghom
|
63560e191e
|
A little load_character() fix: re-re-removing gender restrictions for underwear/hair styles.
|
2020-01-30 18:03:58 +01:00 |
|
kevinz000
|
e6e545b1f2
|
Merge pull request #9860 from Ghommie/Ghommie-cit374
Ports "Mime PDAs only accept emojis for messages, mime cartridge comes with an emoji guidebook"
|
2020-01-29 20:15:22 -07:00 |
|
Lin
|
293e6576c8
|
Merge pull request #10564 from kevinz000/optimization_1
Experimental optimizations
|
2020-01-29 19:25:13 +00:00 |
|
kevinz000
|
611fd7ea89
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-27 23:35:35 -07:00 |
|
Ghommie
|
c69032ff42
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit374
|
2020-01-24 18:56:27 +01:00 |
|
kevinz000
|
bedb42f147
|
Merge remote-tracking branch 'citadel/master' into optimization_1
|
2020-01-24 03:41:40 -07:00 |
|
Ghommie
|
56d31b0c8c
|
neuter/plural gender fixes.
|
2020-01-23 22:50:30 +01:00 |
|
Artur
|
8b21a60ac9
|
MF Line endings
|
2020-01-20 14:09:22 +02:00 |
|
Artur
|
f5ad854c2c
|
Conflict fix
|
2020-01-20 13:50:52 +02:00 |
|
kevinz000
|
89e204b980
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-19 23:12:17 -07:00 |
|
Putnam
|
16f9c1bf78
|
feedback, EORG allowed
|
2020-01-19 18:01:21 -08:00 |
|
Putnam
|
1bdb515592
|
made suicide a config flag
|
2020-01-19 03:44:45 -08:00 |
|
kevinz000
|
7bcb37c5d1
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-16 21:12:56 -07:00 |
|
Putnam
|
de4e65c467
|
Savefile conversion for inesct
|
2020-01-15 20:13:09 -08:00 |
|
Putnam
|
d29603ad77
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-15 15:57:32 -08:00 |
|
Artur
|
5c9b59aa74
|
Ready for testmerge
|
2020-01-15 09:44:29 +02:00 |
|
Artur
|
8b8a112d2c
|
Ohkay
|
2020-01-15 09:41:33 +02:00 |
|
kevinz000
|
eff86a449f
|
wew
|
2020-01-14 16:45:22 -07:00 |
|
Artur
|
e3d3f7b750
|
Ported
|
2020-01-13 13:20:55 +02:00 |
|
Ghommie
|
268146bb93
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit374
|
2020-01-12 17:19:57 +01:00 |
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
Ghom
|
3a72d1f434
|
Merge pull request #10495 from Citadel-Station-13/kevinz000-patch-12
allow guests to use looc
|
2020-01-11 15:09:37 +01:00 |
|
Putnam
|
48fadffbfb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-10 17:57:03 -08:00 |
|
Lin
|
c4cb06f8f0
|
Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
|
2020-01-10 01:31:20 +00:00 |
|
kevinz000
|
dfce4ea75f
|
Update looc.dm
|
2020-01-09 09:30:49 -08:00 |
|