Commit Graph

18581 Commits

Author SHA1 Message Date
Ghom
ee533da3d7 Putting GLOB.blood_reagent_types at use. 2020-02-02 18:34:14 +01:00
kevinz000
e97af26236 ok ghom 2020-02-02 01:37:11 -07:00
kevinz000
38ec4f0e11 Update blood.dm 2020-02-02 01:35:38 -07:00
kevinz000
b59dd11adc Update blood.dm 2020-02-02 01:35:16 -07:00
kevinz000
41f9669a83 Update other_reagents.dm 2020-01-26 13:29:55 -07:00
kevinz000
9292ff1972 Update damage_procs.dm 2020-01-26 13:27:54 -07:00
kevinz000
b8d58ae334 Merge remote-tracking branch 'citadel/master' into revert_poojawa_blood_1 2020-01-25 03:24:37 -07:00
kevinz000
a4c5975b7d Update fail2topic.dm 2020-01-25 02:03:39 -07:00
kevinz000
5e96ffb5a0 compile 2020-01-24 23:18:44 -07:00
kevinz000
ec4d990bfd don't waste memory initializing empty lists 2020-01-24 23:17:29 -07:00
kevinz000
742588c7e4 spacing 2020-01-24 23:09:26 -07:00
kevinz000
9827b15466 Unused variables wasting my memory 2020-01-24 23:05:59 -07:00
kevinz000
ad0c5d7d04 (probably) FIXES INFINITE STREAKING 2020-01-24 23:00:30 -07:00
kevinz000
b9274c63d0 define usage 2020-01-24 22:50:28 -07:00
kevinz000
8a5246c5d6 Reverts gibs being bloody. At all. It already makes splatters stop making blood. 2020-01-24 22:45:23 -07:00
kevinz000
87e7d8ead0 revert cleanable/blood amount per decal oh yeah this is why cults get all that EXTRA BLOOD. 2020-01-24 22:44:40 -07:00
kevinz000
4376434e01 woops 2020-01-24 22:31:05 -07:00
kevinz000
fec5cf1362 optimizations 2020-01-24 22:08:36 -07:00
kevinz000
798af43cae reverts accidental/undocumented voodoo doll buff 2020-01-24 22:01:52 -07:00
kevinz000
b33e6cd79e scanner fix 2020-01-24 22:00:03 -07:00
kevinz000
1877f6d0f5 unused list 2020-01-24 21:48:38 -07:00
kevinz000
102252fb02 Undocumented change: toxloss blood penalty nerf. Sorry, love you slimefolks but put this back in another PR if you want. 2020-01-24 21:48:04 -07:00
kevinz000
75e1108f33 optizmize 2020-01-24 21:45:43 -07:00
kevinz000
32e4355024 lists are references use copy 2020-01-24 21:44:37 -07:00
kevinz000
45516f27a3 optimize lazylist length check 2020-01-24 21:36:22 -07:00
kevinz000
ea65dfa631 iron undocumneted reagent change 2020-01-24 21:32:55 -07:00
kevinz000
d86af199f5 initialize 2020-01-24 21:22:59 -07:00
kevinz000
78b901f66f spacing is a pet peeve 2020-01-24 21:18:51 -07:00
kevinz000
24cbe67f27 optimizations, unnecessary crap, undocumented ipc change 2020-01-24 21:18:19 -07:00
kevinz000
d502f6d6a8 Merge pull request #10670 from Seris02/sneezingnope
stops sneezing, sniffing, coughing, etc from doing anything if the affected person doesn't breathe
2020-01-24 16:16:03 -07:00
kevinz000
ac6695bd68 Merge pull request #10679 from Ghommie/Ghommie-cit517
neuter/plural gender fixes.
2020-01-24 16:15:44 -07:00
kevinz000
147c0d8852 Merge pull request #10680 from Ghommie/Ghommie-cit518
snowflake-friendly towels.
2020-01-24 16:15:27 -07:00
kevinz000
afe8e00bdf Merge pull request #10677 from Ghommie/Ghommie-cit515
Fixes dead malf AIs being able to doomsday, plus a few ported updates.
2020-01-24 16:14:49 -07:00
kevinz000
ea9513864d Merge pull request #10674 from Xantholne/lunar01
Culturally Appropriate Lunar Clothes
2020-01-24 16:14:32 -07:00
Ghom
d5daae98c7 Merge pull request #9905 from Trilbyspaceclone/glassware
[Ready] Cargo MK III - Glassware Addtion
2020-01-24 18:46:25 +01:00
Ghom
f5d8e447eb Merge pull request #10676 from Kraseo/virgohairs
Reorganises/fixes virgo hairs
2020-01-24 16:39:10 +01:00
Ghom
9013c7aa9c Merge pull request #10630 from Citadel-Station-13/kevinz000-patch-17
Nerfs cloning
2020-01-24 16:23:28 +01:00
kevinz000
f626322fbd Merge pull request #10650 from Arturlang/patch-5
[READY]Adds cheap modular computers to the loadout
2020-01-24 00:32:57 -07:00
kevinz000
928a8ceea3 Merge pull request #10628 from Citadel-Station-13/Ghommie-patch-1
Quick rubber toolbox materials fix.
2020-01-24 00:26:22 -07:00
kevinz000
831ac91917 Merge pull request #10073 from Ghommie/Ghommie-cit435
Ports timestop and sepia extracts improvements/tweaks.
2020-01-24 00:25:53 -07:00
kevinz000
f8ec01676a Merge pull request #10609 from Putnam3145/cold-blooded-buff
Moved cold-blooded to negative, made it cost -2
2020-01-24 00:22:08 -07:00
kevinz000
7cd6490e86 Merge pull request #10526 from Seris02/bowmanupgrade
allows headsets to be bowmanized and adds a traitor item for that
2020-01-24 00:21:34 -07:00
kevinz000
07277436ac Merge pull request #10665 from Ghommie/Ghommie-cit513
Fixes chainsaw force being set to 0 on drop.
2020-01-24 00:20:26 -07:00
kevinz000
6ffdc1642b Merge pull request #10632 from Commandersand/nerd
buffs some wiz spell cooldonws and changes some incantation phrases
2020-01-24 00:18:41 -07:00
kevinz000
2a706ceb05 Merge pull request #10664 from kappa-sama/patch-17
makes cursed dragnet take 5 seconds instead of 30 to break out of
2020-01-24 00:18:05 -07:00
loginsandylogout
a7a3a3a417 Update code/modules/spells/spell_types/lightning.dm
po

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-01-23 22:52:18 -06:00
Seris02
90c7149d8c merge conflict fixes 2020-01-24 10:27:48 +08:00
Ghommie
7d5725e450 a dot 2020-01-24 02:31:46 +01:00
Ghommie
78934c52fe A handful of runtime fixes. 2020-01-24 02:27:06 +01:00
Ghommie
c8bf148216 snowflake-friendly towels. 2020-01-24 00:06:07 +01:00