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
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
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
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
683c8b50a8
Fixes #7702
2015-01-09 08:09:46 +10:30
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
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
29435d8750
Fixes #7700
2015-01-09 03:56:12 +10:30
Zuhayr
cd53ed613c
Fixes #7691
2015-01-09 03:51:47 +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
66759eff3c
Adds Borer bantype, halves borer resist time, comments out Devour Brain verb, expands borer welcome text.
2015-01-06 11:11:34 +10:30
Kelenius
4c63e6a3ea
Restores monkey's ability to ventcrawl
...
Fixes #7474 .
2015-01-03 22:41:57 +03:00
Zuhayr
982998d08d
Fixes #7636
2015-01-03 06:53:29 +10:30
Chinsky
5e0676df49
Merge pull request #7631 from Zuhayr/dev-freeze
...
More fixes.
2015-01-02 20:52:27 +03:00
Loganbacca
f3b893942f
More cargo train fixes
...
- Fixes #5906
- Fixes #5939
- Fixes #6282
- Fixes #6634 (properly this time)
- Fixed a bug with updating train stats (causing trains to be super slow if hitched while running)
- Updated train verbs (start/stop/remove key) to only show up if you are in the same turf
- Moved all train specific verbs to their own verb category: "Vehicle"
2015-01-03 01:27:10 +13:00
Zuhayr
e63798ea4e
Fixes oversight with decompiler.
2015-01-02 20:42:59 +10:30
Zuhayr
261f3f935c
Fixes #7627
2015-01-02 19:19:01 +10:30
Zuhayr
89955dbb36
Fixes #7628
2015-01-02 19:02:11 +10:30
Zuhayr
041cd3f3f3
Fixes #7629
2015-01-02 18:58:52 +10:30
Zuhayr
6cae51a945
Fixes #7625
2015-01-02 18:48:06 +10:30
Zuhayr
5b578a1668
Merge resolution.
2015-01-01 22:59:54 +10:30
Loganbacca
dbeec8915e
Cargo train fixes
...
- Partial fix for #6634
- Fixes #7414
- Fixes #7609
2015-01-02 00:05:47 +13:00
Zuhayr
cdfa2a5205
Merge pull request #7586 from Zuhayr/dev-freeze
...
Fixes the remainder of #7567 , plus other fixes.
2014-12-31 22:48:39 +10:30
PsiOmegaDelta
12053e739c
Merge pull request #7590 from mwerezak/walls
...
Less wall and door destruction snowflake, allows obj to damage walls
2014-12-31 11:29:28 +01:00
Zuhayr
fdc8261f0a
Causes spawned alien species to use their default base colour. Adds base colour for Skrell.
2014-12-31 19:34:46 +10:30
mwerezak
d240f6563d
Throwing speed defines
2014-12-31 02:02:49 -05:00
Chinsky
fe403d013b
Merge pull request #7583 from atlantiscze/cellrate-hardsuit-stuff
...
Hardsuit Powersink Adjustments
2014-12-31 08:17:20 +03:00
Zuhayr
a5b937c1e8
Readded null check.
2014-12-31 14:12:10 +10:30
Zuhayr
111b32016f
Merge pull request #7581 from Baystation12/dev-freeze
...
Dev-freeze into dev
2014-12-30 18:53:20 +10:30
Zuhayr
842fe11c59
Fixes a runtime with embedding a deleted weapon.
2014-12-30 16:10:37 +10:30
Atlantiscze
90a83c19cf
Hardsuit powersink module now uses CELLRATE properly
...
- Adds CELLRATE (and SMESRATE for SMESs) into drain_power proc.
- Adds "amount" parameter to drain power proc, sets the powersink module to 40kW draw (80 cell charge/s), which should correspond with normal cell recharger.
- Removes drain_power from all machinery, and adds drain_power to machinery/power. This means you can only drain from machines that have something to do with wiring or electricity.
2014-12-29 20:40:57 +01:00
Zuhayr
c7f0d7cfc7
Merge resolution.
2014-12-30 05:52:59 +10:30
Zuhayr
c6d7a94396
Merge pull request #7575 from mwerezak/voxfix
...
Fixes vox leap special_role check
2014-12-30 05:51:40 +10:30
mwerezak
c4fbe8df34
Fixes vox leap special_role check
2014-12-29 13:04:02 -05:00
Chinsky
d6d1bc15de
Merge pull request #7557 from Zuhayr/dev-freeze
...
Some fixes, siemens coefficient rebalance for species.
2014-12-29 20:56:08 +03:00
Hubblenaut
cfbe4bf8c1
Minor attack message change
2014-12-29 17:04:14 +01:00
Zuhayr
a22f90414b
Fixing weird directory structure stuff.
2014-12-30 01:32:56 +10:30
Atlantiscze
84909f2fbd
NOCLONE -> HUSK
2014-12-29 15:58:21 +01:00
Zuhayr
0af10fc98e
Merge branch 'combat_fixes' of https://github.com/Hubblenaut/Baystation12 into dev-freeze
2014-12-30 01:27:14 +10:30
Zuhayr
68be4d10a2
Merge pull request #7569 from Baystation12/dev-freeze
...
Dev freeze
2014-12-29 22:20:37 +10:30
Zuhayr
1c3e771e07
Merge pull request #7556 from mwerezak/xenobalance
...
Xeno Balancing
2014-12-29 19:21:21 +10:30
Zuhayr
a7b02a0d05
Merge pull request #7561 from Baystation12/dev-freeze
...
Dev freeze
2014-12-29 02:47:31 +10:30
Zuhayr
505d84049c
Properly implements the species insulated var (renames it to siemens_coefficient), includes it in electrocution, rebalances species values accordingly.
2014-12-28 19:16:07 +10:30
Zuhayr
85643543dc
Fixes runtime with bald humans.
2014-12-28 18:58:22 +10:30
Zuhayr
da21480295
Fixes #7546
2014-12-28 17:52:58 +10:30
