Commit Graph

10314 Commits

Author SHA1 Message Date
Thalpy
8a5562e92e Ghmoneie 2019-10-13 23:56:18 +01:00
Thalpy
924fa50659 Update code/modules/surgery/organs/organ_internal.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-10-13 23:55:42 +01:00
Thalpy
094221f4ae IndenettSADgsdfafhfdnfzbdf 2019-10-13 23:52:34 +01:00
Thalpy
7973347bf3 indent 2019-10-13 23:50:25 +01:00
Thalpy
1621c4c7d4 stupid bitflags 2019-10-13 23:50:08 +01:00
Thalpy
e7c5e74d3a Hopefully no break 2019-10-13 23:41:06 +01:00
Ghommie
ff3972247a Fixes some missing species_traits for cloth, clockwork and cult golems. 2019-10-13 23:40:52 +02:00
Thalpy
6a74bf7093 Removes pointless line 2019-10-13 22:35:43 +01:00
Thalpy
ac2aba50a6 Turns Jacq into her own event 2019-10-13 22:33:46 +01:00
Thalpy
9f5b228bfe New Dart 2019-10-13 22:03:36 +01:00
kevinz000
4c52b7a416 Merge pull request #9339 from Ghommie/Ghommie-cit205
Removes revenant blight's shabby tox damage in favor of negative mood effects, and necropolis curse if not cured
2019-10-13 14:00:52 -07:00
kevinz000
48e4187cef Merge pull request #9461 from r4d6/master
Adding Decorative Wings
2019-10-13 14:00:07 -07:00
kevinz000
53858e1818 Merge pull request #9416 from Ghommie/Ghommie-cit215
The niche singularity beacon now also moderately buffs meteor waves.
2019-10-13 13:56:03 -07:00
kevinz000
3d9f012cdb Merge pull request #9464 from JTGSZ/speciesrestrictions2
Re-adds latejoin menu qualifies for rank proc restrictions. Try number 2
2019-10-13 13:55:21 -07:00
kevinz000
064e6980f9 Merge pull request #9474 from Putnam3145/fix-nanites
Makes neural nanite programs not drain nanites on things they can't fix
2019-10-13 13:55:05 -07:00
kevinz000
adeb33cdae Merge pull request #9463 from Owai-Seek/minor-fixes
Updating Kinkmate item-list
2019-10-13 13:54:26 -07:00
Thalpy
356a1279f1 Adds vars for the ball. 2019-10-13 20:06:40 +01:00
Thalpy
a13218b99a Fixes Coronary and Lipo 2019-10-13 17:23:49 +01:00
Poojawa
bd66219767 Clarifies ID Console descriptions 2019-10-13 03:06:22 -05:00
lolman360
3211138a75 wwwwwwww 2019-10-13 18:07:25 +11:00
Ghommie
c78078bdd4 typo 2019-10-13 06:08:53 +02:00
Putnam
1b97c50ef7 Makes pod people not constantly slightly fat 2019-10-12 17:50:51 -07:00
Thalpy
3b8ea30d9b I did it 2019-10-12 20:06:46 +01:00
Thalpy
f6796b93b3 Fixes graft 2019-10-12 18:22:48 +01:00
Thalpy
04b40fd557 Tongues decay slower. 2019-10-12 18:01:02 +01:00
Thalpy
96d5a0f74c Heart decay 2019-10-12 18:00:34 +01:00
Thalpy
7ad16947a7 Cleanups 2019-10-12 18:00:16 +01:00
deathride58
0c8b82168d Merge branch 'master' into Ghommie-cit222 2019-10-12 11:20:32 -04:00
Thalpy
cbc20d33d5 Phew 2019-10-12 15:13:18 +01:00
Thalpy
3f16c287a9 I'm big silly 2019-10-12 13:40:40 +01:00
Thalpy
82446681bf Everything is pain 2019-10-12 13:22:05 +01:00
Thalpy
d94f796ffb aaaa 2019-10-12 12:42:51 +01:00
Putnam
7003080440 Merge branch 'master' into fix-nanites 2019-10-12 02:36:51 -07:00
Fermi
ecfc988911 Okay! 2019-10-12 09:15:32 +01:00
Fermi
2a6b84151e Removed something I didn't mean to 2019-10-12 07:59:44 +01:00
Putnam
c389099a47 Makes brain-healing nanites not work uselessly 2019-10-11 23:58:34 -07:00
Fermi
2e03985696 aaaa 2019-10-12 07:55:19 +01:00
Fermi
f922a3dda5 Fast!! 2019-10-12 07:18:39 +01:00
Poojawa
394c947d14 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-11 23:10:45 -05:00
kevinz000
076b2d48fc Update secbot.dm 2019-10-11 20:46:19 -07:00
kevinz000
8c07a79700 Update bot.dm 2019-10-11 20:45:42 -07:00
kevinz000
5cf627e889 Update computer.dm 2019-10-11 20:43:36 -07:00
kevinz000
f393c7fff2 Update new_player.dm 2019-10-11 20:43:10 -07:00
kevinz000
e600b59217 Update computer.dm 2019-10-11 20:42:01 -07:00
Linzolle
730ca35a31 this really shuoldn't be here 2019-10-11 21:10:10 -05:00
Linzolle
d2ea3b0165 one letter off 2019-10-11 20:53:19 -05:00
Linzolle
9ac22a9fc5 god damn it fermis 2019-10-11 20:19:22 -05:00
Linzolle
b50804dfc3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dissection 2019-10-11 20:06:26 -05:00
deathride58
6e07f8139c Small vampire balance tweaks - Ventcrawling in bat form now requires starvation, cuts down the damage the chapel does outside of batform 2019-10-11 17:25:55 -04:00
Fermi
7bce68bb11 Merge branch 'master' into Spookytime 2019-10-11 21:51:48 +01:00