Markolie
e35431da34
Port Bay's appearance changer
2015-08-01 23:22:20 +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
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
ab083aff50
Mining Fixes
2015-07-30 17:01:59 -04: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
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
Fox-McCloud
e517d172be
Banana Grenade Fix
2015-07-28 21:44:46 -04: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
Markolie
c67bb095fb
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
2015-07-28 18:40:44 +02:00
Markolie
27ec05589b
Missing qdel
2015-07-28 17:31:39 +02:00
Markolie
706d19c24f
Reference/typo fixes
2015-07-28 17:28:56 +02:00
Markolie
b6e446c446
NanoUI traitor uplink
2015-07-28 06:28:01 +02:00
Fox-McCloud
eb694a50eb
Updates Nuke Disk Spawning
2015-07-24 17:33:25 -04:00
DZD
66688f4dbb
Fixes conflicts in icons/obj/gun.dmi.
2015-07-24 15:29:20 -04:00
Fox-McCloud
0945859066
Merge pull request #1554 from Markolie/master
...
Fix OneHuman law
2015-07-22 16:57:23 -04:00
Markolie
4cfd1e4340
Fix OneHuman law
2015-07-22 18:35:09 +02:00
SamCroswell
d84dfe5a49
ERT Rework - Code Changes
2015-07-20 19:37:56 -04:00
Matt
a106daa447
Holopad and binary talk
...
Fixes https://github.com/ParadiseSS13/Paradise/issues/1517 and
https://github.com/ParadiseSS13/Paradise/issues/1483 Aboot it
2015-07-16 14:44:51 +02:00
DZD
29e70854e9
Fix merge conflicts
...
🖕 map conflicts over lines that weren't even edited by both upstream
and this branch.
2015-07-15 22:28:12 -04:00
Fox-McCloud
409fefa4b3
Power Computer and Computer Fixes
2015-07-15 07:00:46 -04:00
Fox-McCloud
da8ac741e9
Merge pull request #1510 from Krausus/FurtherTrayedStructureFixes
...
Further Morgue & Crematorium Fixes
2015-07-14 19:56:56 -04:00
TheDZD
09c5c9d8f5
Merge pull request #1503 from Fox-McCloud/more-explosion-tweaks
...
More Explosion Optimizaitons
2015-07-14 17:33:07 -04:00
Krausus
8e753ac1a6
Removes redundant timestamp
2015-07-14 04:18:35 -04:00
Krausus
6376907560
Further fixes to morgues and crematoriums
2015-07-14 04:08:56 -04:00
Krausus
5d342baffb
Fixes morgues and crematoriums (includes resisting)
...
Fixes their trays breaking for 30 seconds, not logging cremations, not
being able to resist out of them, and all these damn uses of src.
2015-07-13 07:31:48 -04:00
Fox-McCloud
5a0db0e3ee
More Explosion Optimizaitons
2015-07-13 04:32:58 -04:00
ZomgPonies
f4ea821829
Merge pull request #1496 from Fox-McCloud/LINDA-Pressure
...
LINDA Pressure Changes
2015-07-12 22:35:21 -04:00
ZomgPonies
2e2d8794b8
Merge pull request #1498 from Fox-McCloud/security-helmets
...
Re-adds Security Helmets to Officer's Lockers
2015-07-12 06:13:57 -04:00
TheDZD
90026bdec2
Merge pull request #1493 from Fox-McCloud/just-stop
...
Changes a few del to del()
2015-07-11 21:46:22 -04:00
Fox-McCloud
057c15982e
Re-adds Security Helmets to Officer's Lockers
2015-07-11 10:10:57 -04:00
Fox-McCloud
99bf49504a
LINDA Pressure Changes
2015-07-11 06:28:03 -04:00
Fox-McCloud
f5ce957f33
qdel pass II
2015-07-11 02:10:31 -04:00
Fox-McCloud
e4d6acb538
Changes a few del to del()
2015-07-10 23:28:08 -04:00
DZD
3ed90434e0
Projectile, borg, and RnD fixes.
2015-07-10 21:36:23 -04:00
TheDZD
d46aa69852
Merge pull request #1492 from Fox-McCloud/epxlosion-changes
...
Explosion Sound and Performance Tweaks
2015-07-10 20:29:23 -04:00
TheDZD
a5870be481
Merge pull request #1487 from Fox-McCloud/ow-my-non-existent-foot
...
Shard Runtime Fix
2015-07-10 20:29:05 -04:00
Fox-McCloud
36f3e8b52b
Explosion Sound and Performance Tweaks
2015-07-10 20:21:56 -04:00
DZD
412443dbf1
Fix non-icon merge conflicts
2015-07-10 19:57:59 -04:00
DZD
d4cf433e7c
Various fixes, changes, additions, and removal of old features.
...
More changes
2015-07-10 19:41:27 -04:00
Fox-McCloud
068adc1f0a
Shard Runtime Fix
2015-07-10 05:44:29 -04:00
Krausus
41b64d9917
Tweaks explosion throwing
...
Explosions now calculate throwing distances sanely, don't spin
everything they throw, and don't permanently change the speed things go
when thrown by players.
2015-07-10 05:00:53 -04:00
TheDZD
333eb83dee
Merge pull request #1477 from Fox-McCloud/chameleon
...
Updates Chameleon Projector
2015-07-09 22:39:32 -04:00
TheDZD
878c90f56b
Merge pull request #1485 from Fox-McCloud/explosion-tweaks
...
Fixes Explosions Acting on Lighting Overlay
2015-07-09 22:38:23 -04:00
Fox-McCloud
54f59b9899
Pass II
2015-07-09 19:51:40 -04:00
Fox-McCloud
2bcaaf421e
Fixes Explosions Acting on Lighting Overlay
2015-07-09 19:04:29 -04:00
DZD
916f9bf4bb
Sort of compiles
...
Time to fix xenoarch, and then the map.
2015-07-09 15:55:36 -04:00
Fox-McCloud
0dbea7621f
The Great Del() Cull of 2015
2015-07-09 02:48:34 -04:00