080b1b30db
Merge pull request #1612 from Markolie/appearancechanger
...
Ports Bay's appearance changer
2015-08-03 17:30:58 -04:00
429ba1b92b
Merge pull request #1630 from Markolie/master
...
Mecha turret fix
2015-08-03 16:37:41 -04:00
b4c5e8bf6b
Mecha turret fix
2015-08-03 22:21:19 +02:00
625b529484
Fix conflicts
2015-08-03 11:28:24 -04:00
1a15dbd432
Adminboooooooooooooos
2015-08-03 11:25:37 -04:00
d9bb30f47a
Replaces typesof with subtypesof where applicable
2015-08-03 11:04:28 -04:00
c9ecbfd5d8
Merge pull request #1628 from Markolie/master
...
Fix cable coil sprite
2015-08-03 01:15:36 -04:00
f213cf5501
Fix cable coil sprite
2015-08-03 06:37:12 +02:00
a2f8141036
NanoUI power monitor/AI subsystem, mapfix
2015-08-03 03:38:38 +02:00
2e3f4c63dd
Solar control initialization fix
2015-08-03 01:14:06 +02:00
b1b2f4ae92
Compile error fix
2015-08-03 00:58:10 +02:00
89665cfe5c
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into alarms
...
Conflicts:
_maps/map_files/RandomZLevels/moonoutpost19.dmm
_maps/map_files/cyberiad/cyberiad.dmm
code/controllers/master_controller.dm
code/game/machinery/alarm.dm
code/modules/power/apc.dm
2015-08-03 00:04:24 +02:00
7d806cbd12
Merge pull request #1602 from Markolie/powernet
...
Powernet rework
2015-08-02 17:26:37 -04:00
aaa6170fe4
Lighting Runtime Fix
2015-08-02 16:57:14 -04:00
62f2f64063
Make SMES start empty, GC fix
2015-08-02 22:45:25 +02:00
be9ea0b540
Alarm system tweaks
2015-08-02 19:20:37 +02:00
2a824c5fe0
Tweak electrocution damage from power gloves, GC update
2015-08-02 19:10:31 +02:00
4360b5a867
Remove debug proc
2015-08-02 07:14:12 +02:00
73e94b5dc4
Alarm system overhaul
2015-08-02 07:13:03 +02:00
809c34eeb2
Fix xeno icons getting stuck due to impossible check
2015-08-01 20:27:10 -07:00
e35431da34
Port Bay's appearance changer
2015-08-01 23:22:20 +02:00
38b313a454
Engineering outpost solar update
2015-08-01 22:25:32 +02:00
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
0a4a2f34cf
Map updates
2015-08-01 21:41:34 +02:00
4028c2af12
Merge pull request #1611 from Fox-McCloud/dview
...
DVIEW Lighting Fixes
2015-08-01 15:34:36 -04:00
1344de844b
DVIEW Fixes
2015-08-01 15:20:44 -04:00
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
3afb9a75ad
Upgraded pacman fix
2015-08-01 19:37:58 +02:00
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
10ceb14432
Merge pull request #1608 from TheDZD/mining2
...
Diamond Drill and Drone Fixes
2015-08-01 13:13:02 -04:00
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
79613f5121
Merge pull request #1591 from Markolie/mech_recharger
...
Refactor mech recharger
2015-07-31 22:03:16 -04:00
70ed700e24
Make sure mask is selected
2015-08-01 01:56:17 +02:00
008f35d87b
When masks are adjusted, allow CPR
2015-08-01 01:45:51 +02:00
689a96f7ee
GC fixes
2015-08-01 01:09:44 +02:00
b3b226fd59
Fix some oversights
2015-08-01 00:52:04 +02:00
f9d6bd33e6
SMES upgraded fix
2015-08-01 00:38:35 +02:00
e055bbb847
SMES ghost access fix
2015-08-01 00:34:03 +02:00
e5b619783b
Fixes merge conflicts
2015-07-31 18:25:00 -04:00
08f67c7881
Smartfridge update
2015-08-01 00:18:00 +02:00
ed24ac47de
Up to date with -tg-
...
- Ports /tgstation/-tg-station#10871.
- Fixes some errors currently present in the above.
- Ports /tgstation/-tg-station#9927.
2015-07-31 18:15:45 -04:00
51035f931e
Powernet rework
2015-07-31 23:59:41 +02:00
79f3bf810f
Hopefully last commit?
2015-07-31 15:49:39 -04:00
545855e182
Merge pull request #1600 from Fox-McCloud/revenant-fix
...
Revenant Death Fix
2015-07-31 14:24:01 -04:00
e573f73547
Revenant Death Fix
2015-07-31 13:56:41 -04:00
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
30f5465d47
Merge pull request #1593 from FalseIncarnate/master
...
Candy Fixes, Juicer Fix
2015-07-31 12:58:14 -04:00
a66c91a4da
Fixes hivelord infinitely dropping cores
...
Don't know how I forgot about this one.
2015-07-31 11:40:13 -04:00
36221a3c69
Update to tgstation/-tg-station#10254
2015-07-31 11:31:21 -04:00
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