Commit Graph

17256 Commits

Author SHA1 Message Date
TheDZD
525955d8bf Merge pull request #1632 from Fox-McCloud/scheduler-tweaks
Process Scheduler Tweaks
2015-08-03 17:36:19 -04:00
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
62e8889353 Process Scheduler Tweaks 2015-08-03 17:15:12 -04:00
Fox-McCloud
fdf16bcdfa Pod Door Fix 2015-08-03 16:48:01 -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
TheDZD
b28b8d267f Merge pull request #1617 from tigercat2000/misc-tg-stuff
Adds a proc to allow any /atom/movable to smoothly orbit an /atom
2015-08-03 11:23:26 -04: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
Fox-McCloud
a022f14a4a Merge pull request #1607 from FalseIncarnate/master
Removes explosion immunity from chameleon projector
2015-08-02 14:55:06 -04:00
Markolie
2a824c5fe0 Tweak electrocution damage from power gloves, GC update 2015-08-02 19:10:31 +02:00
TheDZD
382c0f61dd Merge pull request #1619 from Fox-McCloud/nuke-ops-fix
Fixes Nuke Ops Energy Sword/Shield Uplink Purchase
2015-08-02 11:18:09 -04:00
Fox-McCloud
330e5c0c8d Fixes Nuke Ops Energy Sword/Shield Uplink Purchase 2015-08-02 02:11:03 -04:00
Markolie
4360b5a867 Remove debug proc 2015-08-02 07:14:12 +02:00
Remie Richards
8856dfcf01 Adds a proc to allow any /atom/movable to smoothly orbit an /atom 2015-08-01 21:57:38 -07: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
7d1f077378 Fix https://github.com/ParadiseSS13/Paradise/issues/1350 2015-08-01 23:01:50 +02:00
Markolie
8e03775eec Floodlight power cell fix 2015-08-01 22:58:45 +02:00
Markolie
38b313a454 Engineering outpost solar update 2015-08-01 22:25:32 +02:00
FalseIncarnate
4b84d7ebd8 spawn() added to ex_act 2015-08-01 15:48:29 -04: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
Markolie
6d1a2cf6d3 Make sure pipes don't runtime 2015-08-01 19:02:08 +02: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
FalseIncarnate
f302506fbd Removes explosion immunity from chameleon projector
Being disguised via chameleon projector will no longer cause the user to
shrug off even the nastiest of explosions. The explosion will now break
the illusion AND cause the appropriate strength ex_act on the user.
2015-08-01 05:30:39 -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
65f2d631d2 Merge pull request #1589 from Fox-McCloud/clown-grenades
Lowers Cost of Clown Grenades
2015-07-31 21:28:53 -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
174c0fae98 Compile error fix 2015-08-01 00:42:32 +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
8cf94f0854 Minor smartfridge fixes 2015-08-01 00:22:21 +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