Fox-McCloud
080b1b30db
Merge pull request #1612 from Markolie/appearancechanger
...
Ports Bay's appearance changer
2015-08-03 17:30:58 -04:00
Fox-McCloud
429ba1b92b
Merge pull request #1630 from Markolie/master
...
Mecha turret fix
2015-08-03 16:37:41 -04:00
Mark van Alphen
b4c5e8bf6b
Mecha turret fix
2015-08-03 22:21:19 +02:00
Fox-McCloud
c9ecbfd5d8
Merge pull request #1628 from Markolie/master
...
Fix cable coil sprite
2015-08-03 01:15:36 -04:00
Markolie
f213cf5501
Fix cable coil sprite
2015-08-03 06:37:12 +02:00
Markolie
2e3f4c63dd
Solar control initialization fix
2015-08-03 01:14:06 +02:00
Fox-McCloud
7d806cbd12
Merge pull request #1602 from Markolie/powernet
...
Powernet rework
2015-08-02 17:26:37 -04:00
Fox-McCloud
aaa6170fe4
Lighting Runtime Fix
2015-08-02 16:57:14 -04:00
Markolie
62f2f64063
Make SMES start empty, GC fix
2015-08-02 22:45:25 +02:00
Markolie
2a824c5fe0
Tweak electrocution damage from power gloves, GC update
2015-08-02 19:10:31 +02:00
Markolie
4360b5a867
Remove debug proc
2015-08-02 07:14:12 +02:00
Tigercat2000
809c34eeb2
Fix xeno icons getting stuck due to impossible check
2015-08-01 20:27:10 -07:00
Markolie
e35431da34
Port Bay's appearance changer
2015-08-01 23:22:20 +02:00
Markolie
38b313a454
Engineering outpost solar update
2015-08-01 22:25:32 +02:00
Markolie
aca3a2cecb
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into powernet
...
Conflicts:
_maps/map_files/cyberiad/cyberiad.dmm
code/game/machinery/alarm.dm
code/modules/power/smes.dm
2015-08-01 21:44:47 +02:00
Markolie
0a4a2f34cf
Map updates
2015-08-01 21:41:34 +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
Markolie
dd067f582a
Update smartfridge types, merge branch 'master' of https://github.com/ParadiseSS13/Paradise into powernet
...
Conflicts:
_maps/map_files/cyberiad/cyberiad.dmm
2015-08-01 19:35:39 +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
Markolie
70ed700e24
Make sure mask is selected
2015-08-01 01:56:17 +02:00
Markolie
008f35d87b
When masks are adjusted, allow CPR
2015-08-01 01:45:51 +02:00
Markolie
689a96f7ee
GC fixes
2015-08-01 01:09:44 +02:00
Markolie
b3b226fd59
Fix some oversights
2015-08-01 00:52:04 +02:00
Markolie
f9d6bd33e6
SMES upgraded fix
2015-08-01 00:38:35 +02:00
Markolie
e055bbb847
SMES ghost access fix
2015-08-01 00:34:03 +02:00
Markolie
08f67c7881
Smartfridge update
2015-08-01 00:18:00 +02:00
Markolie
51035f931e
Powernet rework
2015-07-31 23:59:41 +02: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
