Commit Graph

900 Commits

Author SHA1 Message Date
Fermi
59b6d85c4e Few phrasing and span editing fixes. 2019-06-22 21:59:20 +01:00
Fermi
f096e8440a Finally fixed the vocalchord button 2019-06-22 21:00:20 +01:00
Fermi
226dbe7804 Fixed blank sprite for velvet chord organ 2019-06-22 13:09:18 +01:00
Fermi
d2685be3f6 Split custom echo code into it's own call to reduce overhead. 2019-06-22 12:18:38 +01:00
Fermi
7a3542fc5c Double messages. 2019-06-20 02:49:30 +01:00
Fermi
1cefd6fca7 Added a few more comments for reviewers as I was reviewing myself. 2019-06-19 23:04:08 +01:00
Fermi
713d849c03 Merge remote-tracking branch 'upstream/master' 2019-06-19 21:02:30 +01:00
Fermi
38ed75dc68 Reverts sneaky pandas 2019-06-18 22:48:34 +01:00
Fermi
345acdc94e I just can't wait to be king 2019-06-18 19:38:08 +01:00
Fermi
ade3a4bced Fixes. 2019-06-18 19:06:26 +01:00
Fermi
68a4e3fc06 Lil tweaks. 2019-06-18 13:38:00 +01:00
Fermi
5436014e19 Swaped split state to holo. 2019-06-18 13:16:37 +01:00
Fermi
afeb1d8870 Preholo 2019-06-18 12:49:22 +01:00
Poojawa
bf991cd2da Underwear overlays Gentials, can toggle each seperately (#8602)
* Gentials layered under underclothes

* screm
2019-06-17 11:20:25 -07:00
Fermi
4526832e7d I'm spending too much time trying to fix something rejected. 2019-06-17 15:16:45 +01:00
Fermi
d092dd1da0 Testing hypnoquirk 2019-06-17 12:47:23 +01:00
Thalpy
41eee65b15 Merge branch 'master' into master 2019-06-17 12:18:40 +01:00
kevinz000
6c54c21d9c Merge pull request #8653 from Citadel-Station-13/commjacket
Donator Comm Jacket - [Ready]
2019-06-16 19:54:24 -07:00
LetterJay
92e0d7c20b Update custom_items.dm 2019-06-16 20:54:27 -05:00
LetterJay
6b903893b2 Update __donator.dm 2019-06-16 20:54:02 -05:00
Fermi
4614235f75 Comments. 2019-06-16 13:34:38 +01:00
Fermi
c2b9c0321d Catfix 2019-06-16 13:33:41 +01:00
Fermi
2df7e208b5 Spellchecking. 2019-06-16 12:34:37 +01:00
Fermi
3caadb2009 pH calc redo, too confusing. 2019-06-16 12:22:13 +01:00
Fermi
8fb3022624 Classic me. 2019-06-16 10:25:43 +01:00
kevinz000
6149a44408 Merge pull request #8565 from SkullyRoberts/NudityPermit
Ported the nudity permit from RP and made it a loadout option. You're welcome, Everoth
2019-06-16 01:19:51 -07:00
kevinz000
0dc9d92b8b Merge pull request #8596 from Poojawa/ball-fixes
fixes testicle runtimes
2019-06-16 01:12:08 -07:00
kevinz000
12ecaf63ee Merge pull request #8605 from Trilbyspaceclone/patch-174
Adds medical breifcases
2019-06-16 01:11:11 -07:00
kevinz000
6598688dd7 Merge pull request #8604 from Sishen1542/Scrubswasagoodshow
New loadout options: striped dress, bunny ears! & scrubs for MDs
2019-06-16 01:06:39 -07:00
kevinz000
fa9c74cfa3 Merge pull request #8645 from Ghommie/Ghommie-cit49
stops borgs from sprinting into negative cell charge.
2019-06-16 01:04:09 -07:00
Jay
fcd093f566 commjacket 2019-06-16 02:11:00 -05:00
Ghommie
05066f241b Improving keborgs' movement, not removing. 2019-06-15 20:33:38 +02:00
Fermi
be36a8bb33 Cleanup 2019-06-15 18:04:06 +01:00
Fermi
79d176336c A few minor fixes. 2019-06-15 11:36:38 +01:00
Fermi
3d78905394 Catto fix 2019-06-15 10:29:49 +01:00
Ghommie
280e7d7d81 stops borgs from sprinting into negative cell charge. 2019-06-15 04:36:40 +02:00
LetterJay
0a144545c5 Merge pull request #8625 from Trilbyspaceclone/Donator-1
Blue Kimono for SFox63 - Donator
2019-06-14 21:18:28 -05:00
Fermi
7a66039f0c Fixing merge errors.
Testmerge ready.
2019-06-14 21:55:17 +01:00
Fermi
6b9becce71 Merge branch 'pr/14' 2019-06-14 21:29:04 +01:00
Fermi
aa1cb22edc Eigenstate fixes. 2019-06-14 16:26:08 +01:00
Fermi
b4beb006f9 More fixes. 2019-06-14 15:43:48 +01:00
Fermi
d7cffadc13 Fixes 2019-06-14 13:43:57 +01:00
Fermi
2365f7337c Adventures in bitflags! 2019-06-14 12:47:22 +01:00
Fermi
ab35b018db Indents and eigenstate var reduction. 2019-06-14 11:24:21 +01:00
Fermi
45e51cb68d tweaks 2019-06-13 08:48:58 +01:00
Fermi
2a76cfa285 Logging 2019-06-13 07:51:46 +01:00
Fermi
9fb7c9866d Splitting larger fermi_reagents. 2019-06-13 06:59:46 +01:00
Fermi
aa7805eaa4 Fixes. 2019-06-13 06:35:12 +01:00
Fermi
378af882d3 Ramping up to logging and a few more fixes. 2019-06-13 05:51:28 +01:00
Fermi
da6f1da624 The great src cull 2019-06-13 04:53:33 +01:00