Commit Graph

885 Commits

Author SHA1 Message Date
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
Fermi 14aa7084a8 Breast rename. 2019-06-13 04:37:03 +01:00
Fermi 097c338ded PE replaced with... You know what. 2019-06-13 04:32:52 +01:00
Fermi a3aa0408a3 Tongue 2019-06-13 03:37:15 +01:00
Fermi eab52a51e6 Fixed compile errors. 2019-06-13 03:05:34 +01:00
Fermi 981c1644c9 Holder changes; removed ferminew. 2019-06-13 02:47:05 +01:00
Fermi 8edecb64a6 pHMeter fix 2019-06-13 01:20:36 +01:00
Fermi b51a9e70e5 Fix for pHbooklet. 2019-06-13 01:13:47 +01:00
Trilbyspaceclone 207b12e47a Update custom_items.dm 2019-06-11 19:11:15 -04:00
TrilbySpaseClone 7f3e2dd28b Kimono
Adds blue Kimono for SFox63
2019-06-11 18:00:08 -04:00
kevinz000 54b3568319 Merge pull request #8599 from Poojawa/pacifistic-vore
Pacifists can nom things now, but not feed to others
2019-06-11 11:13:01 -07:00
Sishen 661f064a03 Update _medical.dm 2019-06-10 08:15:44 -04:00
Sishen 30e77035da Update _medical.dm 2019-06-10 07:51:54 -04:00
AnalWerewolf 8337692650 Merge branch 'master' into Fritz-cute 2019-06-10 15:15:41 +10:00
Trilbyspaceclone 5c8f7b326f Update _medical.dm 2019-06-09 12:00:46 -04:00
Sishen 7b48c8899d loadoutsahoy 2019-06-09 11:21:41 -04:00