66688f4dbb
Fixes conflicts in icons/obj/gun.dmi.
2015-07-24 15:29:20 -04:00
0945859066
Merge pull request #1554 from Markolie/master
...
Fix OneHuman law
2015-07-22 16:57:23 -04:00
4cfd1e4340
Fix OneHuman law
2015-07-22 18:35:09 +02:00
d84dfe5a49
ERT Rework - Code Changes
2015-07-20 19:37:56 -04:00
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
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
409fefa4b3
Power Computer and Computer Fixes
2015-07-15 07:00:46 -04:00
da8ac741e9
Merge pull request #1510 from Krausus/FurtherTrayedStructureFixes
...
Further Morgue & Crematorium Fixes
2015-07-14 19:56:56 -04:00
09c5c9d8f5
Merge pull request #1503 from Fox-McCloud/more-explosion-tweaks
...
More Explosion Optimizaitons
2015-07-14 17:33:07 -04:00
8e753ac1a6
Removes redundant timestamp
2015-07-14 04:18:35 -04:00
6376907560
Further fixes to morgues and crematoriums
2015-07-14 04:08:56 -04:00
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
5a0db0e3ee
More Explosion Optimizaitons
2015-07-13 04:32:58 -04:00
f4ea821829
Merge pull request #1496 from Fox-McCloud/LINDA-Pressure
...
LINDA Pressure Changes
2015-07-12 22:35:21 -04:00
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
90026bdec2
Merge pull request #1493 from Fox-McCloud/just-stop
...
Changes a few del to del()
2015-07-11 21:46:22 -04:00
057c15982e
Re-adds Security Helmets to Officer's Lockers
2015-07-11 10:10:57 -04:00
99bf49504a
LINDA Pressure Changes
2015-07-11 06:28:03 -04:00
f5ce957f33
qdel pass II
2015-07-11 02:10:31 -04:00
e4d6acb538
Changes a few del to del()
2015-07-10 23:28:08 -04:00
3ed90434e0
Projectile, borg, and RnD fixes.
2015-07-10 21:36:23 -04:00
d46aa69852
Merge pull request #1492 from Fox-McCloud/epxlosion-changes
...
Explosion Sound and Performance Tweaks
2015-07-10 20:29:23 -04:00
a5870be481
Merge pull request #1487 from Fox-McCloud/ow-my-non-existent-foot
...
Shard Runtime Fix
2015-07-10 20:29:05 -04:00
36f3e8b52b
Explosion Sound and Performance Tweaks
2015-07-10 20:21:56 -04:00
412443dbf1
Fix non-icon merge conflicts
2015-07-10 19:57:59 -04:00
d4cf433e7c
Various fixes, changes, additions, and removal of old features.
...
More changes
2015-07-10 19:41:27 -04:00
068adc1f0a
Shard Runtime Fix
2015-07-10 05:44:29 -04:00
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
333eb83dee
Merge pull request #1477 from Fox-McCloud/chameleon
...
Updates Chameleon Projector
2015-07-09 22:39:32 -04:00
878c90f56b
Merge pull request #1485 from Fox-McCloud/explosion-tweaks
...
Fixes Explosions Acting on Lighting Overlay
2015-07-09 22:38:23 -04:00
54f59b9899
Pass II
2015-07-09 19:51:40 -04:00
2bcaaf421e
Fixes Explosions Acting on Lighting Overlay
2015-07-09 19:04:29 -04:00
916f9bf4bb
Sort of compiles
...
Time to fix xenoarch, and then the map.
2015-07-09 15:55:36 -04:00
0dbea7621f
The Great Del() Cull of 2015
2015-07-09 02:48:34 -04:00
f91f3d84c3
Merge pull request #1473 from Fox-McCloud/destroyer
...
Destroy Pass III
2015-07-08 23:14:09 -04:00
6ca4791571
tweaks
2015-07-08 23:09:57 -04:00
a117067123
Updates Chameleon Projector
2015-07-08 18:09:27 -04:00
b94c3deaf2
Initial Commit for -tg- Mining
...
I can guarantee this will not compile, very much a WIP and currently
consists of mostly copy+pasting -tg-'s modules/mining folder over ours,
and unticking a few of our own files.
2015-07-08 16:19:26 -04:00
ba163bef39
Makes Cables GC Better
2015-07-08 09:30:03 -04:00
0e8619a202
Destroy Pass III
2015-07-08 03:39:52 -04:00
cf6b4b0bb9
removed blood destroy
2015-07-08 01:50:22 -04:00
6e87b96501
Pass 3
2015-07-08 01:34:53 -04:00
0fd80d0b1f
pass one fix
2015-07-08 01:09:10 -04:00
9dc27ce126
Destroy Pass II
2015-07-07 22:26:28 -04:00
b02cd94168
Merge pull request #1467 from Fox-McCloud/del-the-dels
...
Replaces Remaining Del()'s
2015-07-07 19:07:53 -04:00
40c047f89a
Merge pull request #1464 from tigercat2000/gibtoy
...
Minigibber toy
2015-07-07 16:35:36 -04:00
291fb58814
Makes Explosion Particles GC
2015-07-07 06:32:54 -04:00
561e0c2268
pass 3 and cleanup
2015-07-07 01:32:40 -04:00
a9f3eab669
pass 2+fix
2015-07-07 00:58:34 -04:00
88dfaa51a4
Replaces Reamining Del()'s
2015-07-07 00:35:19 -04:00
DZD