Commit Graph

10138 Commits

Author SHA1 Message Date
DZD
ba82f03d7c Drill and drone fixes
- Fixes mining drones having access to a plasma cutter energy weapon,
replaced with a diamond drill. Functionality is almost identical to what
it was with old plasma cutters.
- Pathing fixes for diamond drills.
2015-08-01 10:13:54 -04:00
DZD
a66c91a4da Fixes hivelord infinitely dropping cores
Don't know how I forgot about this one.
2015-07-31 11:40:13 -04:00
TheDZD
48c3926e20 Merge pull request #1584 from Fox-McCloud/military-jacket
Ports over NT Station's Military Jacket
2015-07-31 10:49:07 -04:00
Fox-McCloud
381ed1bf2d Merge pull request #1594 from TheDZD/mining2
Mining Fixes
2015-07-30 19:25:54 -04:00
TheDZD
6ab29c1038 Merge pull request #1592 from veganzombeh/flutterby
Fixes a butterfly typo.
2015-07-30 19:19:39 -04:00
DZD
fbaa994378 Mining Fixes
- Adds fire delay to kinetic accelerator and energy crossbow to prevent
an exploit that allowed rapid firing. This doesn't happen on -tg-'s
code, and the kinetic accelerators and ebow code are identical, so I'm
going to assume our gun code is to blame.
- Few mapping fixes on the asteroid to make sure the conveyor near the
northern mining outpost is powered, and that said outpost is no longer
open on its left side.
2015-07-30 19:02:28 -04:00
veganzombeh
a6b3287fb7 Aquashes to squashes 2015-07-30 23:47:16 +01:00
Fox-McCloud
ab083aff50 Mining Fixes 2015-07-30 17:01:59 -04:00
Fox-McCloud
578e57f715 Ports over NT Station's Military Jacket 2015-07-29 21:23:47 -04:00
Markolie
267a95c327 Supermatter pathing fix 2015-07-30 03:10:09 +02:00
Markolie
660ffad9a0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/modules/power/port_gen.dm
2015-07-30 03:08:33 +02:00
Fox-McCloud
1ee7853d65 Merge pull request #1476 from TheDZD/mining2
Mining Overhaul [Soon™]
2015-07-29 20:51:24 -04:00
tigercat2000
0e5a77911d Remove invisimin ghost-icon code, leave TODO 2015-07-29 17:00:43 -07:00
DZD
284c562bc0 Plasmamen
- Mining plasmaman spacesuit now has the same slowdown as a mining RIG,
but can now be upgraded with Goliath hide plates.
2015-07-29 18:57:39 -04:00
DZD
51eca017ad Fixes based on feedback 2015-07-29 18:39:54 -04:00
DZD
ab29813d4c Removes MRSPACMAN Generator
This used one of the Bay metals as a power source, I removed the actual
machine but forgot to remove the design and board. Whoops. Also, fuck
people setting object paths as strings instead of actual paths.
2015-07-29 17:32:06 -04:00
DZD
c11effafa0 Fixes and minor change
- Fixes goliaths infinitely dropping hides.
- Makes the basilisk anti-infinidrop bug not use a var specifically for
it, and instead just check if the mob is already dead before trying to
drop (living basilisks will drop items, THEN die).
- Minor mapping changes (added lights I forgot to add to previously
changed areas, made the entrance area of the western mining outpost
slightly larger and added another air vent to it.)
2015-07-29 17:14:00 -04:00
Markolie
bda9f75698 Include permabrig in prison break 2015-07-29 06:50:46 +02:00
Markolie
7b9488309d Update crew monitor to Bay's latest 2015-07-29 03:37:51 +02:00
DZD
9c46fe994b Map and pathing fixes
- Fixes random broken shit introduced by some combination of Git,
Mapmerge, and/or Dream Maker.
2015-07-28 19:31:36 -04:00
Markolie
a1c22b6abd Fix incorrect pathing 2015-07-29 00:54:41 +02:00
Markolie
6fa10982e1 Span fixes 2015-07-29 00:53:02 +02:00
Markolie
9ce6884719 Pacman refactor/NanoUI 2015-07-29 00:41:54 +02:00
DZD
3873543a9a Gibtonite sprite fix 2015-07-28 18:32:02 -04:00
Markolie
69f7e04719 Prison break refactor, Requests Console refactor 2015-07-29 00:12:44 +02:00
Markolie
398bd40dfe Robot Control/supermatter NanoUI 2015-07-28 23:06:01 +02:00
Markolie
8ac25a71e5 NanoUI portable scrubber/pump 2015-07-28 22:22:26 +02:00
Markolie
d23b27f75d NanoUI disposal units 2015-07-28 21:59:26 +02:00
Markolie
b8a7ca7d1b Update NanoUI to be up-to-date with Bay 2015-07-28 21:04:44 +02:00
Markolie
154a282a0d NanoUI caching for cameras/crew manifest 2015-07-28 19:54:17 +02:00
Tigercat2000
7db323ffe2 Remove invisimin icon-setting. It's terrible. 2015-07-28 10:52:43 -07:00
Markolie
a60157fe5b Make sure check trajectory works 2015-07-28 19:14:56 +02:00
DZD
6180243d65 Minor changes
- Changes asteroid wall sprites.
- Gives miners a styptic patch.
- Removes code that was previously commented out related to the
stationary mining drills.
2015-07-28 13:07:24 -04:00
Markolie
c67bb095fb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-07-28 18:40:44 +02:00
Markolie
1e20f58e5c Turret fixes 2015-07-28 18:40:26 +02:00
Markolie
56989c8fbd Convert multi shuttle UI's to NanoUI 2015-07-28 04:39:00 +02:00
Markolie
b39a775164 Span fixes, re-add fingerprint to operating computer 2015-07-28 02:42:27 +02:00
Markolie
b9c2f52471 Update NanoUI map, add verb to Mapping menu in debug mode 2015-07-28 00:02:59 +02:00
Markolie
483d2b5864 Make more consoles accessible to ghosts 2015-07-27 23:40:23 +02:00
TheDZD
7fb91f6088 Merge pull request #1567 from Fox-McCloud/borer-tweaks
Borer Tweaks
2015-07-27 12:17:38 -04:00
Fox-McCloud
3ecaadde48 Merge pull request #1571 from Markolie/master
Fixes
2015-07-27 11:46:35 -04:00
Fox-McCloud
f1dda5b677 Merge pull request #1564 from FalseIncarnate/master
Kitchen Overhaul 2: Table Edition
2015-07-26 23:46:51 -04:00
Markolie
ef3e2e8c7b Fix tabbing 2015-07-26 22:15:12 +02:00
Markolie
573843c237 Revenant pref update 2015-07-26 22:13:24 +02:00
Markolie
fed5808f66 ensure the current song ends when streaming is disabled 2015-07-26 06:23:30 +02:00
TheDZD
43d53c8135 Merge pull request #1568 from Fox-McCloud/immortal-diona
Diona Amputation Fix
2015-07-25 21:57:52 -04:00
Fox-McCloud
5a23dbdc35 Diona Amputation Fix 2015-07-25 21:39:09 -04:00
Fox-McCloud
4a06ac4db5 Borer Tweaks 2015-07-25 21:05:36 -04:00
FalseIncarnate
ad9ad7fc40 Kitchen Overhaul 2: Table Edition
Moves a number of kitchen recipes to utilize table-crafting!
- Instead of dumping the ingredients in the microwave, simply collect
them on the table to assemble your dish via the table-crafting menu
- The option to assemble the dish will only appear if all the
ingredients are present on the SAME table section.

Table-crafted foods:
- Sandwich
- Slime Jelly Sandwich
- Cherry Jelly Sandwich
- Slime Jelly Burger
- Cherry Jelly Burger
- Not-a-sandwich
- Egg Wrap
- Herb Salad
- Aesir Salad
- Valid Salad
- Ingredients are unchanged

Standardizes the chef's knife usage!
- Now the chef can use the Cutlet knife (knife utensil), kitchen knife,
butcher knife, or scalpel to cut meat into cutlets!
- Now the Cutlet Knife (knife utensil) can be properly used to slice
cakes, pizza, bread, flat dough, and so forth instead of scooping up a
bit onto the knife.
- If a food object cannot be sliced (no slice_path defined), it will
scoop up a bit as before. Forks, spoons, and plastic knives will always
scoop, regardless of slice_path.

Fixes the Toasted Sandwich microwave recipe not working.
- It was missing a result, meaning it was not being loaded as an
acceptable recipe and causing the microwave to reject sandwiches.

BACKEND CODER CRAP:
- Tablecrafting recipes now can support botany produce and adjusting
chems in the result item.
- New fruit list var is used for botany produce
- New AdjustChems proc is used to handle final chem adjustments, such as
removing or adding chems from the finished product.
2015-07-25 06:38:09 -04:00
DZD
d64568e309 Adds the can_charge var to energy guns
If set to 0, makes it so the gun cannot be charged in recharges. Set to
1 by default, only the nuclear (AKA advanced) egun and both plasma
cutters have it set to 0. (Nuclear egun was previously unable to be
charged, but used an istype check specific to it.)
2015-07-24 16:02:13 -04:00