Commit Graph

9278 Commits

Author SHA1 Message Date
Fermi
a6b211a4a3 Fixes for beakers. 2019-06-13 03:25:16 +01:00
Fermi
91e58d896e Spelling is hard. 2019-06-13 03:24:02 +01:00
Fermi
93973b630c Moonsugar edit. 2019-06-13 03:08:01 +01:00
Fermi
b07f3b37ff Saline edit 2019-06-13 03:07:25 +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
3368d3d98b Fixed taste.dm 2019-06-13 02:32:42 +01:00
Fermi
5e4ced1a60 Sorta changes to say.dm 2019-06-13 02:26:04 +01:00
Fermi
099afc3c8e Removed hypnoflash TC 2019-06-13 02:21:37 +01:00
Fermi
70734b705a Forgot to commit to blood. 2019-06-13 02:01:42 +01:00
Fermi
9effbb1e33 Removed increase/decrease blood var. 2019-06-13 01:58:26 +01:00
Fermi
c8bcca5964 Staged hypnoflash removal. 2019-06-13 01:45:48 +01:00
Fermi
17403bd059 Non-functioning EMP code for review (revert before merging.) 2019-06-13 00:58:54 +01:00
Arturlang
44be4ea7b4 Reviewers suggestions 2019-06-12 23:58:54 +03:00
Ghommie
4cc7636da1 fixing more. 2019-06-12 22:50:09 +02:00
Arturlang
4d532ee67e Fixeds 2019-06-12 23:34:49 +03:00
Arturlang
d83cf7e2eb Bug fix 2019-06-12 20:22:55 +03:00
Arturlang
b747e0739e Improvements 2019-06-12 20:16:26 +03:00
BlackMajor
142d62908f Actually make it 15, the pie starts with 13u already used 2019-06-12 21:18:56 +12:00
BlackMajor
7b79bbcb29 Changes transfer amount to 10u instead of the full 80 2019-06-12 21:17:31 +12:00
BlackMajor
90e572ec03 Honk 2019-06-12 20:03:17 +12:00
unknown
b90d344afc It works. It just works. 2019-06-12 01:10:21 +03: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
kevinz000
d2b40ea73d Merge pull request #8610 from Sishen1542/fingerlessinsuls
Changes assistant family heirloom to a pair of fingerless insulated gloves
2019-06-11 11:03:56 -07:00
kevinz000
6ead9bbe65 Merge pull request #8587 from SkullyRoberts/DickImplant
Added a single use penis autosurgeon as rare maint loot. Because why the hell not?
2019-06-11 10:56:44 -07:00
unknown
80eb813a07 RD can now suplex a rod. Good fucking luck. 2019-06-11 18:53:17 +03:00
unknown
355e384ba1 Spacing fixes 2019-06-11 14:31:27 +03:00
unknown
9219401154 Doneso 2019-06-11 14:24:16 +03:00
TrilbySpaseClone
3cebb1e807 Worked?
Yay?
2019-06-10 22:59:36 -04:00
Trilbyspaceclone
437e66fe3e Update uplink_items.dm 2019-06-10 17:17:45 -04:00
Ghommie
a7bbfe46ac Fix chem dispensers starting with an extra power cell 2019-06-10 14:55:17 +02:00
BlackMajor
7523c86071 Wasn't I supposed to do this in January 2019-06-10 22:55:38 +12:00
Poojawa
d8dbad6e2e Digitigrade socks 2019-06-10 04:47:07 -05:00
Sishen
9f80fbe68b Coloring gloves? Not on my watch! 2019-06-10 05:20:54 -04:00
Sishen
4eccc12205 Why are we here? Just to suffer? 2019-06-10 04:56:24 -04:00
Poojawa
17629d4feb client check I guess 2019-06-10 03:28:56 -05:00
kevinz000
49b61b54db yeah no stamina buffer I GUESS 2019-06-10 00:18:41 -07:00
kevinz000
8ba3609a4d god why fuck 2019-06-10 00:07:04 -07:00
Ghommie
79c4ce502e more pda skins. 2019-06-10 00:28:43 +02:00
Trilbyspaceclone
0d7b769eee Merge branch 'master' into meteor 2019-06-09 17:01:06 -04:00
Ghommie
d2e216f2de tested fixed tested fixed tested. 2019-06-09 19:55:08 +02:00
Trilbyspaceclone
7c59349ad3 Update medical.dm 2019-06-09 12:02:16 -04:00
Poojawa
3f1b7e4dd6 Pacifists can nom things now, but not feed to others 2019-06-09 02:23:53 -05:00
kevinz000
b534f57374 Update human.dm 2019-06-08 23:44:27 -07:00
Poojawa
cac80ec8c8 Update laborstacker.dm 2019-06-09 01:43:39 -05:00
kevinz000
1cf5e24b4d Update human.dm 2019-06-08 23:23:21 -07:00
Ghommie
cb255b8719 give'r or leave'r, buddy. 2019-06-09 06:54:26 +02:00
Ghommie
c3fa360270 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit43 2019-06-09 04:50:10 +02:00
kevinz000
88240ca06c Merge remote-tracking branch 'origin/master' into changeling_adrenaline 2019-06-08 19:45:19 -07:00
kevinz000
ec9ae5348f Merge remote-tracking branch 'origin/master' into kevinz000-patch-48 2019-06-08 19:10:59 -07:00