398459c2e7
Merge remote-tracking branch 'upstream/dev' into inventoryfix
...
Conflicts:
code/modules/organs/organ_external.dm
2015-03-31 02:13:22 -04:00
9b2f5cea33
Merge remote-tracking branch 'upstream/dev' into inventoryfix
...
Conflicts:
code/game/gamemodes/revolution/rp-revolution.dm
code/game/machinery/kitchen/juicer.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/items/weapons/cigs_lighters.dm
code/game/objects/structures/stool_bed_chair_nest/stools.dm
code/modules/destilery/main.dm
code/modules/hydroponics/biogenerator.dm
code/modules/mob/living/carbon/human/inventory.dm
code/modules/mob/living/carbon/monkey/inventory.dm
code/modules/projectiles/guns/launcher/pneumatic.dm
2015-03-31 01:37:55 -04:00
1b4e13aabc
Removes unnecessary and cruft procs from mob/inventory.dm
2015-03-30 05:28:09 -04:00
aa6439096c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs
2015-03-26 23:25:26 +10:30
97112c8a4c
Replaced display_name with name, worked on severing limbs and damage propagation.
2015-03-25 19:07:22 +10:30
d26800d29c
Preliminary work on converting all monkeys to a human subspecies.
2015-03-25 02:15:45 +10:30
b9072baa97
Merge with dev.
2015-03-24 14:41:07 +10:30
2a17d656f2
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-03-23 11:47:15 +01:00
bf8ad6d585
Rebalanced xenoflora sprites, fixed numerous issues.
2015-03-22 16:13:15 +10:30
7ab57a4917
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/storage/fancy.dm
code/modules/mob/living/carbon/human/life.dm
2015-03-20 08:44:52 +01:00
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
618249131e
Gives more/better comfychair color options. Removes unused icons from objects.dmi.
2015-03-18 00:26:42 -04:00
458970a617
Merge remote-tracking branch 'upstream/dev' into reagent_dispenser
2015-03-16 21:21:56 +00:00
e0f23aead5
Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.
2015-03-11 21:17:51 +10:30
9aed472531
Minor storage cleanup
...
Demotes folding to storage/box, makes doughnut boxes a subtype of box.
Removes a couple of istype() hacks from storage.
2015-03-05 11:08:22 -05:00
c3388020ff
Reagent dispenser rework
2015-03-02 02:25:32 +00:00
2139884244
Dev merge.
2015-02-21 19:49:47 +10:30
81599a9203
Merge pull request #8175 from Kelenius/ofBorgsAndSynths
...
Adds robot synths
2015-02-21 11:43:39 +03:00
a0b73140e9
Fixes for synths and decompiler
2015-02-20 13:32:10 +03:00
1c1e644f29
Adds robot synths
2015-02-19 21:04:27 +03:00
57ffdc82f6
Replaces stool structures with stool items
2015-02-18 01:06:00 -05:00
8fb5836e4f
Generalized fruit products properly.
2015-02-13 03:52:46 +10:30
1c3b1087dd
Merge pull request #7582 from Zuhayr/richard
...
Do you like hurting other people?
2015-02-03 18:10:34 +03:00
10de826ca3
Removes FPRINT and TABLEPASS flags
2015-01-23 22:27:32 +03:00
5e7133dd08
Converted baseball bats to twohanded weapons.
2015-01-20 19:14:38 +10:30
0d071e7f9d
Fixes #7683
2015-01-09 03:48:46 +10:30
a76af3c7c5
Fixes #7572
2014-12-30 16:33:34 +10:30
a7f47e32d7
Merge pull request #7534 from mwerezak/doors
...
Doors and stacks
2014-12-28 13:14:23 +10:30
07debf9405
Adjusts door repair to use a welding tool
2014-12-25 15:31:15 -05:00
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
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
591fc164de
Updating rack paths to match previous commit.
2014-12-24 12:26:43 +10:30
4882074739
Code formatting, EOL at EOF fixes, refactoring
2014-12-18 03:11:49 +01:00
cadfecddce
Merge pull request #7202 from PsiOmegaDelta/PlasticBag
...
Constructable blood packs.
2014-12-02 20:31:12 -05:00
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
8f342ada74
Constructable blood packs.
...
Can now make your own blood packs from plastic.
2014-12-01 08:40:58 +01:00
cec617a414
Merge resolution, compile fixes with outdated glass paths/map.
2014-11-19 23:17:25 +10:30
af8da7de03
Adjusts glass sheet construction menu input
2014-11-16 22:30:07 -05:00
4090f04839
Readded monkey dexterity checks in each attack_hand as appropriate.
2014-11-13 17:46:37 +10:30
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
bc438e21ad
All the relevant examine changes.
2014-11-05 12:44:23 +01:00
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
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
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
70b2c9a1fa
Who thought it was a good idea to omit multiplier for 1x ?!?
2014-10-14 22:48:48 +02:00
6387c96bb5
Ambiguous expression readded.
2014-10-14 22:31:19 +02:00
eb707ea9b6
Prevent stacks multiplier href exploit
2014-10-14 18:34:53 +02:00
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
0c83a95b90
Large merge resultion. Used remote for map conflicts.
2014-09-23 21:41:54 +09:30
67cb6e297e
Merge pull request #6254 from Kelenius/OfStacks
...
Of Stacks
2014-09-02 17:58:28 +09:30
mwerezak