Commit Graph

14703 Commits

Author SHA1 Message Date
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
7c73203fc2 Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 2019-06-13 01:58:28 +01:00
Fermi
9effbb1e33 Removed increase/decrease blood var. 2019-06-13 01:58:26 +01:00
Thalpy
ad8c1593f6 Reduced medical jargon on scanners. 2019-06-13 01:47:29 +01:00
Fermi
18292d4fc6 Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 2019-06-13 01:46:10 +01:00
Fermi
c8bcca5964 Staged hypnoflash removal. 2019-06-13 01:45:48 +01:00
Fermi
fab603fabe Removed hypnotherapy quirk 2019-06-13 01:44:48 +01:00
Thalpy
f3a3e4c47a Removed hypnotherapy quirk 2019-06-13 01:31:28 +01:00
Thalpy
a9aa913860 Added remove() for bloodpressure 2019-06-13 01:24:50 +01:00
Fermi
7b764c9fa9 Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 2019-06-13 01:18:16 +01:00
Fermi
281c0ce582 Reduced happiness mood effects. 2019-06-13 01:02:39 +01:00
Fermi
463b4e19ec (var/mob/living/master = parent) fix 2019-06-13 01:01:19 +01:00
Fermi
17403bd059 Non-functioning EMP code for review (revert before merging.) 2019-06-13 00:58:54 +01:00
Thalpy
0fa194575a Update DNA.dm 2019-06-13 00:42:27 +01:00
Ghommie
e2bf5b73fd I'm being too careless, sorry for the many commits. 2019-06-12 23:22:31 +02:00
Ghommie
7a8eaf41ac another get_cell() 2019-06-12 23:21:42 +02:00
Ghommie
5ba46eb517 Avoid runtiming. 2019-06-12 23:20:34 +02:00
Ghommie
2edef99b08 . 2019-06-12 23:16:27 +02:00
Ghommie
a29095cbe1 Penitence for the awful mistakes I have done in the refactor. 2019-06-12 23:06:09 +02:00
Arturlang
44be4ea7b4 Reviewers suggestions 2019-06-12 23:58:54 +03:00
Ghommie
5a35e95735 . 2019-06-12 22:52:05 +02:00
Ghommie
4cc7636da1 fixing more. 2019-06-12 22:50:09 +02:00
Arturlang
4d532ee67e Fixeds 2019-06-12 23:34:49 +03:00
Ghommie
368267f53d dddddd 2019-06-12 20:31:24 +02:00
Ghommie
516b71ed7e fixing stunbatons. 2019-06-12 20:13:08 +02: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
BlackMajor
e2ad96f4c9 Made a shitty space ruin robotics lab 2019-06-12 01:21:16 +12: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
BurgerLua
1bd0ff5ef1 Merge remote-tracking branch 'upstream/master' into RCDMEMES 2019-06-10 16:40:10 -07:00
Useroth
18c31ef22b Fixed the rapier sprites. 2019-06-11 00:39:56 +02:00
Trilbyspaceclone
9cb3da57b2 Impaled 2019-06-10 17:33:49 -04:00
Trilbyspaceclone
cc2240366e Update belt.dm 2019-06-10 17:33:08 -04:00
Trilbyspaceclone
437e66fe3e Update uplink_items.dm 2019-06-10 17:17:45 -04:00
Trilbyspaceclone
8cc0ca14cb Update misc.dm 2019-06-10 17:11:39 -04:00