Commit Graph

16414 Commits

Author SHA1 Message Date
Ghommie
321c30cf89 now with 51% more loads. 2019-10-14 06:24:54 +02:00
Ghommie
3671755142 My cat resting on my neck is just sooo warm, like a best scarf. 2019-10-14 06:06:25 +02:00
Ghommie
e969e89ce5 Well, byond quirks. 2019-10-14 03:09:15 +02:00
Poojawa
dad9f7f6ce Helping edgecase things 2019-10-13 19:41:46 -05:00
Ghommie
22fc7a9088 Resprites bedsheet bins in 3/4 perspective, adds towel bins subtype. 2019-10-14 02:32:23 +02:00
Poojawa
bcb11a471d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-13 19:14:16 -05:00
Poojawa
fad517fccb oh let's unsnowflake this one too I guess 2019-10-13 19:06:46 -05:00
Poojawa
198f2b7add Fixes missing decorative wing states 2019-10-13 19:02:28 -05:00
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
1fda4deef7 Merge pull request #9465 from Trilbyspaceclone/patch-230
Update granters.dm
2019-10-13 13:58:03 -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
kevinz000
32b2d629e4 Merge pull request #9473 from PersianXerxes/stopCultSpareTPing
Set clockcult teleport in Captain's Quarters to false.
2019-10-13 13:46:40 -07:00
Zna12
18f10afcd7 Borgs are now consumable by scrub pups. 2019-10-13 15:23:50 -05: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
Thalpy
150b20103e Random tab 2019-10-13 16:39:37 +01:00
Thalpy
764c3e5757 Missed one 2019-10-13 16:38:05 +01:00
Thalpy
fc08d06352 Reverts 3/4 link buttons 2019-10-13 16:36:38 +01:00
Thalpy
7b27d9bd24 Library time 2019-10-13 16:19:32 +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
Ghommie
7b65343f45 z-level checks. 2019-10-13 06:04:57 +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
3abbfffdb8 Argh 2019-10-12 13:20:39 +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