Commit Graph

10155 Commits

Author SHA1 Message Date
Markolie
e35431da34 Port Bay's appearance changer 2015-08-01 23:22:20 +02:00
TheDZD
4028c2af12 Merge pull request #1611 from Fox-McCloud/dview
DVIEW Lighting Fixes
2015-08-01 15:34:36 -04:00
Fox-McCloud
1344de844b DVIEW Fixes 2015-08-01 15:20:44 -04:00
Markolie
2c1d0ea7d4 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cloner
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
2015-08-01 19:41:11 +02:00
Markolie
3afb9a75ad Upgraded pacman fix 2015-08-01 19:37:58 +02:00
Fox-McCloud
10ceb14432 Merge pull request #1608 from TheDZD/mining2
Diamond Drill and Drone Fixes
2015-08-01 13:13:02 -04:00
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
Fox-McCloud
79613f5121 Merge pull request #1591 from Markolie/mech_recharger
Refactor mech recharger
2015-07-31 22:03:16 -04:00
TheDZD
545855e182 Merge pull request #1600 from Fox-McCloud/revenant-fix
Revenant Death Fix
2015-07-31 14:24:01 -04:00
Fox-McCloud
e573f73547 Revenant Death Fix 2015-07-31 13:56:41 -04:00
Fox-McCloud
151d8d3229 Merge pull request #1585 from Markolie/headlamp
Add borg headlamp, add movement states for some borgs, add jetpack overlay to all miner borgs
2015-07-31 13:34:53 -04:00
Fox-McCloud
30f5465d47 Merge pull request #1593 from FalseIncarnate/master
Candy Fixes, Juicer Fix
2015-07-31 12:58:14 -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
FalseIncarnate
9d13429769 Candy Fixes, Juicer Fix
Fixes a number of New() procs for candies that would runtime
- Issue was caused by incorrect arguments for the add_reagent proc

Fixes gummy worms being incorrectly named gummy bears

Fixes the candy cane recipe resulting in a mint rather than a candy cane

Re-paths recipes for flavored candies to not be subtypes of the plain
version to fix the generation of candy moulds from recipes that don't
require the mould.
- Also applied this to candybars so the recipe path better communicates
the end-result

Updates the recipes for the WTF (druggy) gummy bears and worms to work
with the botany update ambrosia
- Previously checked for the hardcoded path rather than the kitchen_tag
which the rest of the kitchen was updated to use

Fixes the juicer failing to juice watermelon slices
2015-07-30 19:01:43 -04:00
veganzombeh
a6b3287fb7 Aquashes to squashes 2015-07-30 23:47:16 +01:00
Markolie
3703210ba3 Ditch pacman2 code (unused) 2015-07-30 23:29:39 +02:00
Markolie
6f5c0497ec Refactor mech recharger 2015-07-30 23:22:49 +02:00
Fox-McCloud
ab083aff50 Mining Fixes 2015-07-30 17:01:59 -04:00
Markolie
f939800c68 Update upgradable machinery New code 2015-07-30 22:19:32 +02:00
Markolie
cd9659bf9a Organ icon runtime fix 2015-07-30 20:12:16 +02:00
Markolie
c2cbaa7627 Add borg headlamp, add movement states for surgeon/miner bot, add jetpack overlay to all miner borgs 2015-07-30 19:33:49 +02: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