a784a74ccb
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 13:35:26 -07:00
7a1bc9d22b
Fixes the travis issues
...
Fixes the travis issues, Exo still remains a mystery
2020-02-20 19:11:04 -05:00
4ca9eb4171
Fixes healing nanites
...
Fixes Accelerated Regeneration, Bio Regen, and Mechanical.
Also changed one line on Exo nanites but it doesn't fix those. Dunno what to do.
2020-02-20 18:11:54 -05:00
26bbc64f16
Merge pull request #11136 from Owai-Seek/broomport-2-17-19
...
Ports Broom, Tweak Janitor Vendor
2020-02-20 11:48:06 +01:00
d680ab9fd5
Merge pull request #11025 from Arturlang/TGUI_Next_Nanites
...
Ports TGUI Next and a lot of misc updates for nanites.
2020-02-20 11:27:48 +01:00
b5e369aaf1
i forgot about that one
2020-02-19 21:00:31 -06:00
2d32c47743
so i forgot to change that over
2020-02-19 20:59:02 -06:00
c7273c03be
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-19 19:12:27 -07:00
49279086b7
Merge pull request #11113 from CameronWoof/biogeneratin'
...
Adds diethylamine and saltpetre to the biogenerator
2020-02-19 19:03:35 -07:00
9589c3116b
Merge pull request #11115 from Ghommie/Ghommie-cit583
...
Something more about runtime errors.
2020-02-19 19:03:01 -07:00
901b54b7e8
Webedit man to the doom and rescue
2020-02-20 01:38:28 +02:00
796f51b557
Merge branch 'master' into TGUI_Next_Nanites
2020-02-20 00:52:55 +02:00
0e4692c63d
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-18 18:16:34 -07:00
ed46d3ca1c
Typo
2020-02-18 00:37:28 -05:00
1a994e7f1e
Ports Broom, Tweak Janitor Vendor
...
Ports Brooms from TG https://github.com/tgstation/tgstation/pull/49120
Makes Broom printable.
Reduces Broom sound effect.
Updates Janitor Vendor to have equipment for at least 2 janitors.
2020-02-17 23:36:22 -05:00
28a589d2d1
diethylamine > ammonia
2020-02-17 04:32:39 -08:00
a4a5efbc11
ghommble's other changes
2020-02-16 15:48:22 -08:00
3ecd1b75d4
ghommald's changes
2020-02-16 15:32:05 -08:00
23ae9996d2
Something more about runtime errors.
2020-02-16 15:24:15 +01:00
206e546254
reordering these designs
2020-02-16 04:15:50 -08:00
14e41e8d68
adds diethylamine and saltpetre to the biogenerator
2020-02-16 03:52:07 -08:00
5c2e244ee0
Ports /tg/ pr #44529 , reverts #9092
2020-02-16 22:20:50 +11:00
3fde58434f
Merge branch 'master' into more_implants
2020-02-16 01:55:19 -05:00
14fdd90618
Nerfs public autolathes ( #10970 )
2020-02-16 07:37:24 +01:00
2d9c8ce8fc
fixing merge conflicts
2020-02-15 15:41:52 +08:00
33931da018
Merge pull request #11013 from r4d6/pickaxe
...
Add two more pickaxes, Titanium & Plasteel
2020-02-14 19:34:01 +01:00
7650f9d45e
shield b gone
2020-02-13 14:20:31 -05:00
7964d768fa
Initial Commit
2020-02-13 20:51:52 +02:00
c01f78b8e8
Conflict fix
2020-02-13 17:52:28 +02:00
121b37410a
Merge pull request #10997 from Owai-Seek/tinytweaks-2-9-20
...
Sprites, Tweaks, and Snacks, QoL
2020-02-13 16:40:12 +01:00
47709a7ea8
forgot the shield implant
2020-02-13 03:52:41 -05:00
75844930b4
new implants!
2020-02-13 03:42:59 -05:00
a7d29ae830
Merge pull request #10973 from Trilbyspaceclone/put-a-pin-in-it
...
Station Locked firing pins
2020-02-13 09:42:22 +01:00
bfdef7fcfd
Merge pull request #10755 from kevinz000/attack_chain
...
small refactor to melee_attack_chain
2020-02-13 09:39:07 +01:00
eca0e0f2dc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-13 00:39:20 -07:00
5c102d4da0
Ghommies suggestions
2020-02-12 11:30:55 +02:00
a9a167b9d3
Suffering and co
2020-02-11 20:18:32 +02:00
5549cd93f1
Merge branch 'master' into tinytweaks-2-9-20
2020-02-11 07:20:16 -05:00
8b68e57de0
Add the pickaxes
2020-02-10 22:02:39 -05:00
f1f8123e5a
Merge pull request #10989 from Citadel-Station-13/Ghommie-patch-5
...
CallMaterialName reagent fix
2020-02-10 20:27:38 +00:00
a0666e7454
Merge pull request #11000 from Seris02/rcdfixyeet
...
makes RCDs not cost a single sheet of glass and metal
2020-02-10 12:20:40 +01:00
01390fa0e0
Merge remote-tracking branch 'citadel/master' into attack_chain
2020-02-10 04:18:02 -07:00
e6aa47997c
fix rcd cost
2020-02-10 16:00:21 +08:00
bb641fecf8
Sprites, Tweaks, and Snacks
...
-Fixes Trash Can recipie. Now craftable with 10 metal, removed with welder.
-Adds an additional sprite for Duke Purple Tea so Tea and Coco don't look the same.
-Adds Bacon and Eggs Sprite and Food Item
-Adds Unique Sprite for Drying Agent bottle.
-Adds Chocolate Bar to the... Chocolate Vendor.
-Allows Trash Bag to fit Limbs (Not Heads)
-Allows Mops to be Printable
-Allows Bio Bags to pick up Limbs and Organs. Disallows Cybernetics, Brains, and Implants.
Ports the following from TG:
Printable Mops
https://github.com/tgstation/tgstation/pull/44141
Makes Limbs Small Weight (To Fit in Trashbags)
https://github.com/tgstation/tgstation/pull/44730
2020-02-09 23:07:32 -05:00
29207b22fb
Merge branch 'master' into debug_outfit_updates
2020-02-09 22:05:26 +02:00
bcbaea4a7b
CallMaterialName reagent fix
2020-02-09 10:46:29 +01:00
5dbfc9a514
Yay
2020-02-08 03:25:09 -05:00
8c2019fcbf
probably fixes plant disk techdisk
2020-02-07 17:58:36 -05:00
c9dc35fd9a
Updates the debug outfit
2020-02-06 18:42:23 +01:00
980d26df76
Cadaver Management
2020-02-06 02:48:30 -05:00
kevinz000