21fe8be5dc
Mmmmm, more crates.
...
Fixed: Engineering Hardsuit Crate
Removed:
Duplicate Exotic Seed Crate
Festive Wrapping Paper Crate (Replaced)
Tweak:
Grouped some stuff in each tab. (Medical Kits, Space Suits, Ingredients, Meals)
Added Ambrosia Seed to Seed Crate
Added 2 Spray Cans to Biker Gang Crate
Moved:
Grill to Service
All Vending Supplies to a new tab.
Added:
Candle Crate
Dirty Magazine Crate (Emag)
CBT Interrogation Crate (Contraband)
Cargo Packaging Crate
Pest Control Crate (Contraband)
Candlelit Dinner Crate
Portable Air Pump Crate
Portable Scrubber Crate
Pastry Crate
Burger Combo Crate
Known Issues:
I don't know how to get randomised crates to show up in the proper order.
2020-01-27 07:00:40 -05:00
2acb52fb56
Merge pull request #10690 from Ghommie/Ghommie-cit525
...
Additional runtime fixes.
2020-01-25 05:54:35 -07:00
f199b720aa
Merge pull request #10689 from Ghommie/Ghommie-cit524
...
Even more runtime fixes.
2020-01-25 05:54:20 -07:00
a5404f6063
Merge pull request #10687 from Ghommie/Ghommie-cit523
...
A few more, ported, runtime fixes.
2020-01-25 05:54:03 -07:00
72cfd35438
Merge pull request #10684 from Ghommie/Ghommie-cit521
...
fix for hypospray jank.
2020-01-25 05:53:42 -07:00
72a8096137
Merge pull request #10683 from Ghommie/Ghommie-cit520
...
A few consistencies for those "shoes" that don't actually cover feet.
2020-01-25 05:53:26 -07:00
26459a156d
Merge pull request #10682 from Ghommie/Ghommie-cit519
...
Ports "Makes falsewall hide pipes and wires"
2020-01-25 05:53:07 -07:00
ac6695bd68
Merge pull request #10679 from Ghommie/Ghommie-cit517
...
neuter/plural gender fixes.
2020-01-24 16:15:44 -07:00
147c0d8852
Merge pull request #10680 from Ghommie/Ghommie-cit518
...
snowflake-friendly towels.
2020-01-24 16:15:27 -07:00
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
ea9513864d
Merge pull request #10674 from Xantholne/lunar01
...
Culturally Appropriate Lunar Clothes
2020-01-24 16:14:32 -07:00
6fe0c57c42
run-extra-times fixes.
2020-01-24 20:48:32 +01:00
d5daae98c7
Merge pull request #9905 from Trilbyspaceclone/glassware
...
[Ready] Cargo MK III - Glassware Addtion
2020-01-24 18:46:25 +01:00
f5d8e447eb
Merge pull request #10676 from Kraseo/virgohairs
...
Reorganises/fixes virgo hairs
2020-01-24 16:39:10 +01:00
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
831ac91917
Merge pull request #10073 from Ghommie/Ghommie-cit435
...
Ports timestop and sepia extracts improvements/tweaks.
2020-01-24 00:25:53 -07:00
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
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
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
a6c3917bfc
M H M H
2020-01-24 05:01:51 +01:00
95a2479c6a
Additional runtime fixes.
2020-01-24 04:59:56 +01:00
bd6e364612
But wait, there is more!
...
No...
2020-01-24 04:33:55 +01:00
1ba4c19c64
A couple more.
2020-01-24 03:50:44 +01:00
67f58b8a59
A few more runtime fixes.
2020-01-24 03:30:34 +01:00
90c7149d8c
merge conflict fixes
2020-01-24 10:27:48 +08:00
721fd108f9
A few more, ported, runtime fixes.
2020-01-24 03:02:07 +01:00
9ee70c7931
Travis is just faster at compiling, I can work on other things meanwhile
2020-01-24 02:34:32 +01:00
78934c52fe
A handful of runtime fixes.
2020-01-24 02:27:06 +01:00
ba2c149d4d
Improvements.
2020-01-24 02:22:32 +01:00
6b62aef86c
Missing !
2020-01-24 02:19:52 +01:00
524f665f4a
fix for hypospray jank.
2020-01-24 02:17:41 +01:00
05150e821e
A few consistencies for those "shoes" that don't actually cover feet.
2020-01-24 01:25:23 +01:00
8e5f221bb9
Ports "Makes falsewall hide pipes and wires"
2020-01-24 00:57:27 +01:00
c8bf148216
snowflake-friendly towels.
2020-01-24 00:06:07 +01:00
56d31b0c8c
neuter/plural gender fixes.
2020-01-23 22:50:30 +01:00
9466b0f4ca
Merge branch 'master' into glassware
2020-01-23 13:31:04 -05:00
14a33ee7dc
Merge pull request #10651 from r4d6/Soft-rad-suit
...
Make the radiation hardsuit a voidsuit instead
2020-01-23 19:23:09 +01:00
292aaa58dc
Fixes dead malf AI doomsday, a few ported updates.
2020-01-23 17:36:23 +01:00
14b7711590
i will end whoever ported virgo hairs and thought it was fine to do it like that
2020-01-23 17:29:21 +01:00
21867f60dd
Merge pull request #10598 from Putnam3145/metabolic-synth-tweak
...
Made metabolic synthesis nanites stop if not fed
2020-01-23 16:38:39 +01:00
86a3a5dd4d
Merge pull request #10610 from Owai-Seek/bountytweaks
...
Some Bounty Tweaks
2020-01-23 15:44:00 +01:00
f3b9b20e57
Merge pull request #10672 from BlackMajor/master
...
Fixes a donor sprite.
2020-01-23 15:30:29 +01:00
bd8ce9a7b6
Culturally Appropriate Lunar Clothes
2020-01-23 06:35:50 -07:00
77e7dff11b
Webedit PR man bad
2020-01-24 01:41:40 +13:00
3d85499919
Requested Changes + Nerf
...
Nerf cannabis bounties, comment out monkey cube bounty, change to shady jims.
2020-01-23 07:20:22 -05:00
5fb2e60ebf
Merge branch 'master' into master
2020-01-24 00:50:46 +13:00
83591f8883
Merge pull request #10620 from Hatterhat/patch-1
...
exo suit nerf - melee and bomb armor
2020-01-23 04:48:06 -07:00
aa19c2a17b
Merge pull request #10603 from Ghommie/Ghommie-cit510
...
clockwork cuirass now compatible with snakes. The original author was too lazy.
2020-01-23 04:47:18 -07:00
1b7265d8c1
Merge pull request #10605 from r4d6/Layer
...
Port TG Layers updates and Freezer update
2020-01-23 04:46:52 -07:00
7733d3f98a
Update robot_modules.dm
2020-01-24 00:42:41 +13:00
Winter Flare