Kelenius
7e8622b76a
Fixes #8210
...
Medicine stacks will now give one message per item category.
For example:
You clean and seal an ugly ripped cut and a ripped cut on Kelenius's
right arm.
You clean and seal an ugly ripped cut and a cut on Kelenius's left arm.
You clean and seal a cut, a cut, and a cut on Kelenius's left arm.
Code cleanup, spanclasses, spacing, stuff.
2015-07-17 09:24:13 +03:00
PsiOmegaDelta
65fc980b20
Stack splitting and cable merging fixes.
...
Split stacks will now keep the same colors.
Can now only join cables of the same color together, unless you are a borg.
2015-06-04 13:24:12 +02:00
Kelenius
20d62c87ff
Borg module fixes
...
Fixes #8775
Fixes #8797
2015-04-10 09:50:47 +03:00
Zuhayr
bf8ad6d585
Rebalanced xenoflora sprites, fixed numerous issues.
2015-03-22 16:13:15 +10:30
PsiOmega
6e2488ccb0
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/stacks/sheets/sheet_types.dm
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
2015-03-20 08:26:34 +01:00
Mandurrrh
618249131e
Gives more/better comfychair color options. Removes unused icons from objects.dmi.
2015-03-18 00:26:42 -04:00
Zuhayr
2139884244
Dev merge.
2015-02-21 19:49:47 +10:30
Chinsky
81599a9203
Merge pull request #8175 from Kelenius/ofBorgsAndSynths
...
Adds robot synths
2015-02-21 11:43:39 +03:00
Kelenius
a0b73140e9
Fixes for synths and decompiler
2015-02-20 13:32:10 +03:00
Kelenius
1c1e644f29
Adds robot synths
2015-02-19 21:04:27 +03:00
mwerezak
57ffdc82f6
Replaces stool structures with stool items
2015-02-18 01:06:00 -05:00
Zuhayr
8fb5836e4f
Generalized fruit products properly.
2015-02-13 03:52:46 +10:30
Chinsky
1c3b1087dd
Merge pull request #7582 from Zuhayr/richard
...
Do you like hurting other people?
2015-02-03 18:10:34 +03:00
Kelenius
10de826ca3
Removes FPRINT and TABLEPASS flags
2015-01-23 22:27:32 +03:00
Zuhayr
5e7133dd08
Converted baseball bats to twohanded weapons.
2015-01-20 19:14:38 +10:30
Zuhayr
0d071e7f9d
Fixes #7683
2015-01-09 03:48:46 +10:30
Zuhayr
a76af3c7c5
Fixes #7572
2014-12-30 16:33:34 +10:30
Zuhayr
a7f47e32d7
Merge pull request #7534 from mwerezak/doors
...
Doors and stacks
2014-12-28 13:14:23 +10:30
mwerezak
07debf9405
Adjusts door repair to use a welding tool
2014-12-25 15:31:15 -05:00
mwerezak
f297f7cd0a
Stack reorganization, use() now dels after yield
...
stack/use() now only deletes an empty stack after the current context
yields, removing the need for some awkward patterns when dealing with
stacks. Also adds procs for transferring and splitting stacks.
2014-12-25 15:09:09 -05:00
mwerezak
64e26b2dbd
Fixes robot stacks transferability
...
Cleans up transferring between stacks and makes robot stacks
transferable with regular ones.
2014-12-25 15:06:31 -05:00
Zuhayr
591fc164de
Updating rack paths to match previous commit.
2014-12-24 12:26:43 +10:30
Amunak
4882074739
Code formatting, EOL at EOF fixes, refactoring
2014-12-18 03:11:49 +01:00
Ccomp5950
cadfecddce
Merge pull request #7202 from PsiOmegaDelta/PlasticBag
...
Constructable blood packs.
2014-12-02 20:31:12 -05:00
Mloc-Argent
117ca6a135
refactor 'dir = ' into 'set_dir()'
...
This should have little/no gameplay effect right now, just paving the
way for directional lights.
Replaced handle_rotation() on buckly things with this.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-12-01 13:44:02 +00:00
PsiOmega
8f342ada74
Constructable blood packs.
...
Can now make your own blood packs from plastic.
2014-12-01 08:40:58 +01:00
Zuhayr
cec617a414
Merge resolution, compile fixes with outdated glass paths/map.
2014-11-19 23:17:25 +10:30
mwerezak
af8da7de03
Adjusts glass sheet construction menu input
2014-11-16 22:30:07 -05:00
Zuhayr
4090f04839
Readded monkey dexterity checks in each attack_hand as appropriate.
2014-11-13 17:46:37 +10:30
mwerezak
ab2b4608e0
Fixes #6702 and cleanup
...
Makes reinforced glass a subtype of glass, cleans up window creation copypasta.
Cleaned up window initialization leaking outside of the window constructor.
Removes unnecessary init_dir var from windows.
2014-11-12 20:09:04 -05:00
PsiOmega
bc438e21ad
All the relevant examine changes.
2014-11-05 12:44:23 +01:00
PsiOmega
f8ead9139a
(De)constructable emergency shutters.
...
Can now construct emergency shutter assemblies from metal sheets, same as door assemblies.
Requires air alarm circuits to complete, rather than airlock circuits.
2014-10-31 13:35:48 +01:00
Mloc-Argent
4871a3a850
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/ATMOSPHERICS/pipes.dm
icons/atmos/pipes.dmi
2014-10-15 22:13:44 +01:00
Mloc-Argent
a18c147c37
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/ATMOSPHERICS/pipes.dm
icons/atmos/pipes.dmi
2014-10-15 14:40:42 +01:00
Menshin
70b2c9a1fa
Who thought it was a good idea to omit multiplier for 1x ?!?
2014-10-14 22:48:48 +02:00
Menshin
6387c96bb5
Ambiguous expression readded.
2014-10-14 22:31:19 +02:00
Menshin
eb707ea9b6
Prevent stacks multiplier href exploit
2014-10-14 18:34:53 +02:00
Mloc
9faec14707
donut boxes now update their icon to properly reflect their contents
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-05 19:24:30 +01:00
Zuhayr
0c83a95b90
Large merge resultion. Used remote for map conflicts.
2014-09-23 21:41:54 +09:30
Zuhayr
67cb6e297e
Merge pull request #6254 from Kelenius/OfStacks
...
Of Stacks
2014-09-02 17:58:28 +09:30
Kelenius
505f857eb8
Stack update
2014-09-02 09:59:32 +04:00
Zuhayr
066772b1ce
Fixes #5879
2014-09-01 22:45:37 +09:30
Whitellama
aa0ab32a9c
Egg boxes and donut boxes can be constructed from cardboard
2014-08-28 18:27:51 -07:00
Kelenius
a1348faa8c
Cables are now stacks
2014-08-25 18:54:35 +04:00
Zuhayr
b47d91b612
Merge resolution, master into dev.
2014-08-21 12:01:38 +09:30
Walter0o
f5ca79d003
fixes building more than 1 grille per turf
...
rapidly triggering attack_self() enabled building more than 1 per turf,
which is fairly abusive and not indended.
2014-08-16 22:48:13 +02:00
GinjaNinja32
05e7c4a07a
Moved all shard code to one file. Fixed #5992
2014-08-13 21:05:27 +01:00
Zuhayr
4ef8a08310
Added portable_atmospherics to hydroponics machine path, couple of other tweaks.
2014-07-27 03:20:16 +09:30
Mloc-Argent
d5e9851b62
integrate XGM into the code
...
New turf proc: assume_gas(). Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
more.
Zones now process all fire data and existance in one go, fire objects
only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
structured for the new gas_mixtures.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-07-22 19:52:12 +01:00
DJSnapshot
eacd384d39
Merge pull request #5554 from Baystation12/master
...
Updating dev with master
2014-07-09 23:00:04 -07:00
