Mloc-Argent
70f67409d5
HE pipe changes
...
HE pipes will now change colour as they heat up, the procs for
calculating this are in type2type.dm.
Mobs buckled to HE pipes will be forced to lie down and will share
heat with and get burned by the pipe network.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2015-01-12 21:28:41 +00:00
Mloc-Argent
537b78fc80
refactor buckling to be more generic
...
Buckling procs and vars have been moved down to /obj.
Behaviour is mostly the same, but you can buckle cuffed people to
pipes and they will automatically unbuckle if the cuffs are removed.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2015-01-12 21:28:31 +00:00
Zuhayr
a539780086
Merge pull request #7759 from Baystation12/dev-freeze
...
Dev < Dev freeze
2015-01-10 04:58:48 +10:30
Zuhayr
ad6801c5f2
Merge pull request #7758 from Zuhayr/dev-freeze
...
Dev freeze
2015-01-10 04:43:02 +10:30
Zuhayr
aac2510427
Merge resolution
2015-01-10 04:42:40 +10:30
Zuhayr
6a6332437a
Merge pull request #7750 from Amunak/patch-1
...
Reverted "say error helper" before there is a better implementation or option to toggle it
2015-01-09 14:11:05 +10:30
PsiOmegaDelta
894f71de69
Merge pull request #7738 from Zuhayr/dev-freeze
...
Fixes.
2015-01-09 04:39:55 +01:00
Amunak
8fa2fdb51b
Reverted "say" error helper
...
Commented out the "say error helper" before we have a better implementation or before it can at least be toggleable. Current state doesn't fit way too many edge casess.
2015-01-09 03:56:58 +01:00
Zuhayr
a2e30b4ee9
Addresses #7744
2015-01-09 09:12:31 +10:30
PsiOmegaDelta
4735419c6f
Merge pull request #7741 from Tramziller/Bugfixes
...
Response to #7724
2015-01-08 23:29:46 +01:00
Zuhayr
5bbe1ecaa8
Amends nymph pulling fix to add higher w_class. Adds fail messages to pAI and nymphs trying to drag non-items.
2015-01-09 08:59:38 +10:30
Zuhayr
fd311a412f
Fixes #7742 .
2015-01-09 08:58:11 +10:30
Zuhayr
f43f58380c
Fixes #7703
2015-01-09 08:26:53 +10:30
Zuhayr
683c8b50a8
Fixes #7702
2015-01-09 08:09:46 +10:30
Tramziller
11ff174636
Old link was replaced by new one
2015-01-08 22:26:31 +01:00
Zuhayr
7c88b54404
Fixes #7722
2015-01-09 07:30:48 +10:30
Zuhayr
a4fca84e3e
Fixes #7726
2015-01-09 06:44:09 +10:30
Zuhayr
704d668b18
Merge pull request #7732 from GinjaNinja32/dmitool
...
[dmitool] Add importing PNG files as icon_states
2015-01-09 06:41:38 +10:30
Zuhayr
a01592d5b7
Fixes #7740
2015-01-09 06:25:27 +10:30
Zuhayr
7e0610e31c
Fixes #7684
2015-01-09 04:18:42 +10:30
Zuhayr
8d2d3302bd
Fixes #7720
2015-01-09 04:07:08 +10:30
Zuhayr
c3756e3a03
Fixes #7701
2015-01-09 04:05:11 +10:30
Zuhayr
a23e0aa91f
Fixes #7679
2015-01-09 03:59:43 +10:30
Zuhayr
b36b41a2f5
Fixes #7656
2015-01-09 03:58:43 +10:30
Zuhayr
29435d8750
Fixes #7700
2015-01-09 03:56:12 +10:30
Zuhayr
cd53ed613c
Fixes #7691
2015-01-09 03:51:47 +10:30
Zuhayr
0d071e7f9d
Fixes #7683
2015-01-09 03:48:46 +10:30
Zuhayr
f6481dde6d
Merge pull request #7735 from mwerezak/events
...
Adjusts major event weightings, fixes meteor event
2015-01-08 21:55:51 +10:30
Zuhayr
f637f265d0
Merge pull request #7736 from mwerezak/engine
...
Fixes engine intercooler
2015-01-08 19:50:05 +10:30
mwerezak
4c20d23597
Fixes intercooler
2015-01-08 00:44:46 -05:00
mwerezak
08cda65973
Adjusts major event weightings
2015-01-08 00:00:57 -05:00
mwerezak
c3413bc7d7
Fixes meteor event
2015-01-07 23:29:52 -05:00
Zuhayr
ebe7108364
Merge pull request #7733 from GinjaNinja32/sh_is_not_bash
...
Fix clean_map_git.sh
2015-01-08 08:57:34 +10:30
=
cb11a95aa7
Fix clean_map_git.sh
2015-01-07 20:22:55 +00:00
=
73da1156a2
Various improvements; options, version, info
...
Adds options to PNG importing so that any valid DMI file can be entirely built from PNG files and DMITool.
Adds version string and "version" command
Adds info command to get a list of states easily (the only way previously was to print the descriptor with "dmitool -vvvv verify $file" and parse with e.g. grep/sed)
2015-01-07 17:26:21 +00:00
Zuhayr
2734765963
Merge pull request #7731 from Baystation12/dev-freeze
...
Dev freeze
2015-01-07 18:55:11 +10:30
Zuhayr
4988fa5170
Merge pull request #7730 from Baystation12/master
...
Dev-freeze < master
2015-01-07 18:54:51 +10:30
PsiOmegaDelta
69d7644dc0
Merge pull request #7727 from LightningIron/master
...
Changes manual fire interface icon to be less confusing.
2015-01-07 09:23:02 +01:00
Zuhayr
0d56551319
Merge pull request #7729 from Baystation12/dev-freeze
...
Dev freeze
2015-01-07 18:15:03 +10:30
Zuhayr
fa2bd1d7b4
Merge pull request #7728 from Baystation12/master
...
Master into dev-freeze
2015-01-07 18:11:27 +10:30
LightningIron
d10546eb16
Changes manual fire interface icon to be less confusing.
2015-01-06 22:15:16 -06:00
Zuhayr
45cb9dbacf
Merge pull request #7718 from Tramziller/dev-freeze
...
Response to #7686
2015-01-07 08:03:55 +10:30
Chinsky
6ba932cab1
Merge pull request #7712 from Mloc/bs12-license
...
clear up licensing situation
2015-01-07 00:21:41 +03:00
Tramziller
29a0ae2ad6
Response to #7686
2015-01-06 21:48:56 +01:00
Tramziller
4f654b7b06
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev-freeze
2015-01-06 21:48:16 +01:00
Zuhayr
07298fa31a
Merge pull request #7697 from Tramziller/dev-freeze
...
Shot airlock fix
2015-01-07 06:02:06 +10:30
Zuhayr
ab711b5080
Merge pull request #7695 from Amunak/patch-1
...
Makes LOOC dark turquoise, fixes #7681
2015-01-07 04:33:56 +10:30
Zuhayr
8aabf81739
Merge pull request #7715 from Ccomp5950/dev
...
Dev-Freeze -> Dev merge
2015-01-07 04:16:59 +10:30
ccomp5950
27765f799f
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
...
Conflict resolution.
Conflicts:
code/ATMOSPHERICS/components/unary/vent_pump.dm
2015-01-06 12:36:28 -05:00
Zuhayr
0ace887633
Merge pull request #7714 from Zuhayr/dev-freeze
...
Master into dev-freeze
2015-01-07 03:45:33 +10:30
Mloc-Argent