PsiOmegaDelta
|
1b10f78940
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/modules/mob/living/carbon/human/life.dm
|
2015-08-13 09:01:10 +02:00 |
|
HarpyEagle
|
19fbc71249
|
Removes req_amount from stack_recipe_list
The stack_recipe_list datum itself is not used to make anything, so having
a req_amount made little sense. Fixes #10572.
|
2015-08-12 15:54:16 -04:00 |
|
HarpyEagle
|
3e6889927e
|
Fixes #10500
|
2015-08-12 15:26:57 -04:00 |
|
HarpyEagle
|
a43f77b070
|
Gives hydro soil recipe a better name
Gives the hydro soil recipe a name that better conveys it's purpose.
|
2015-08-12 15:25:01 -04:00 |
|
PsiOmega
|
e875a7ce48
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/game/machinery/computer3/buildandrepair.dm
code/game/objects/items/devices/lightreplacer.dm
code/modules/research/circuitprinter.dm
code/modules/research/protolathe.dm
|
2015-08-08 15:34:51 +02:00 |
|
HarpyEagle
|
fc7e89380e
|
More material renames
Gives several materials shorter and easier to type names, updating the
display_name where applicable. Also fixed a slightly mismatched variable
type.
|
2015-08-07 17:10:35 -04:00 |
|
mwerezak
|
d1bd146b1a
|
Changes reinforced glass material name
Gives the reinforced glass material a name that is easier to verify for
correctness.
|
2015-08-03 23:01:34 -04:00 |
|
mwerezak
|
0ceb0e291d
|
Fixes #10314
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
|
2015-08-02 00:01:10 -04:00 |
|
mwerezak
|
e3609bac94
|
Adds common proc to obtain the material of an object
Adds a common get_material() proc to objects, and implements overrides
where applicable
|
2015-08-01 23:03:21 -04:00 |
|
PsiOmegaDelta
|
df83203356
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/modules/hydroponics/seed_mobs.dm
code/modules/materials/materials.dm
|
2015-07-09 08:45:49 +02:00 |
|
Zuhayr
|
550ea5f127
|
Fixes #9740
|
2015-07-09 03:40:26 +09:30 |
|
Zuhayr
|
76571bf758
|
Fixes #9646
|
2015-07-09 03:29:24 +09:30 |
|
PsiOmegaDelta
|
b5a47fd43b
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/modules/mob/living/silicon/ai/life.dm
code/modules/power/rust/circuits_and_design.dm
code/modules/power/rust/core_gen.dm
code/modules/power/rust/fuel_compressor_construction.dm
code/modules/power/rust/fuel_injector.dm
|
2015-07-01 22:46:40 +02:00 |
|
Zuhayr
|
8ab80b7394
|
Removes the RUST engine.
|
2015-07-01 15:50:55 +09:30 |
|
PsiOmega
|
f25e8a7a67
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/game/objects/items/stacks/tiles/plasteel.dm
code/game/objects/items/stacks/tiles/tile_types.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/pai/pai.dm
code/modules/surgery/implant.dm
code/setup.dm
|
2015-06-26 20:28:47 +02:00 |
|
mwerezak
|
aae29d8b6e
|
Adds 'melting' and ignition points for various materials
|
2015-06-26 00:41:19 -04:00 |
|
mwerezak
|
9d7a1b9ad6
|
Fixes misleading path and proc name
|
2015-06-26 00:40:31 -04:00 |
|
PsiOmegaDelta
|
405131a54e
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/projectiles/guns/energy/stun.dm
code/modules/projectiles/guns/projectile/pistol.dm
code/modules/projectiles/guns/projectile/revolver.dm
|
2015-06-20 20:40:06 +02:00 |
|
Zuhayr
|
7d9378748d
|
Comments out fire and rads for material objects since they are very imbalanced atm.
|
2015-06-20 22:48:08 +09:30 |
|
Zuhayr
|
062f06ecb9
|
Fixes #9835
|
2015-06-20 21:00:02 +09:30 |
|
PsiOmegaDelta
|
772488fadc
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
.travis.yml
code/setup.dm
maps/exodus-1.dmm
maps/exodus-5.dmm
|
2015-06-17 09:33:34 +02:00 |
|
PsiOmegaDelta
|
06a1ece4b8
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/ZAS/Controller.dm
code/datums/mind.dm
code/game/objects/items/devices/scanners.dm
code/game/objects/items/stacks/sheets/glass.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/brain/posibrain.dm
code/modules/mob/living/silicon/pai/pai.dm
|
2015-06-16 10:52:33 +02:00 |
|
mwerezak
|
637306eb14
|
Adds holographic plastic
|
2015-06-14 22:18:11 -04:00 |
|
mwerezak
|
eb0f1fa69e
|
Makes R-walls double plasteel
Makes R-walls double plasteel like on master, adjusts plasteel integrity
so that R-walls have the same health as on master as well.
|
2015-06-14 15:33:48 -04:00 |
|
Zuhayr
|
f9134028b6
|
Fixes #9777
|
2015-06-10 23:14:34 +09:30 |
|
Zuhayr
|
8a2c0226dc
|
Fixes #9597
|
2015-06-10 23:14:32 +09:30 |
|
PsiOmegaDelta
|
81ee9178bd
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
|
2015-06-08 09:57:33 +02:00 |
|
Chinsky
|
bb824dba42
|
Merge pull request #9721 from atlantiscze/apcfix
Refactors /obj/item/apc_frame to /obj/item/frame/apc
|
2015-06-07 12:43:01 +03:00 |
|
PsiOmega
|
b5c0478ae2
|
Fixes compilation errors.
|
2015-06-07 11:14:06 +02:00 |
|
PsiOmega
|
fc6de24042
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/game/objects/items/weapons/tanks/tanks.dm
code/modules/materials/material_sheets.dm
code/modules/organs/organ_icon.dm
code/setup.dm
|
2015-06-07 10:51:41 +02:00 |
|
Atlantis
|
41d4c2eb13
|
Refactors /obj/item/apc_frame to /obj/item/frame/apc
- This fixes broken APC frame placement on walls - #9537
|
2015-06-07 06:26:10 +02:00 |
|
GinjaNinja32
|
8d799293ba
|
Merge pull request #9701 from Zuhayr/dev-freeze
Fixes #9597
|
2015-06-07 03:14:06 +01:00 |
|
Atlantis
|
265719b4aa
|
Fixes #9705
- Carboard now has Integrity of 10. For comparsion, wood has 25, steel 150 and plasteel 800.
|
2015-06-06 17:30:43 +02:00 |
|
Zuhayr
|
f03fc826f1
|
Fixes #9597
|
2015-06-06 11:20:56 +09:30 |
|
PsiOmega
|
3d49ad3927
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/game/jobs/job/job.dm
code/game/jobs/job/silicon.dm
code/game/objects/items/weapons/surgery_tools.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/mob/living/carbon/human/species/station/station.dm
code/modules/organs/organ_external.dm
icons/obj/objects.dmi
|
2015-06-01 09:07:03 +02:00 |
|
Chinsky
|
10218eb8c9
|
Merge pull request #9573 from Zuhayr/chairs
Chair update.
|
2015-05-31 11:33:24 +03:00 |
|
Zuhayr
|
201712eb3d
|
Added MATERIAL_PADDING flag.
|
2015-05-31 17:19:32 +09:30 |
|
Zuhayr
|
b3102824a0
|
Fixes #9544
|
2015-05-31 03:56:06 +09:30 |
|
Zuhayr
|
f9e99e1ee9
|
Fixes #9581
|
2015-05-31 03:34:29 +09:30 |
|
PsiOmega
|
d0232732d4
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/game/machinery/floodlight.dm
code/game/objects/items/devices/suit_cooling.dm
code/modules/organs/subtypes/diona.dm
code/modules/paperwork/pen.dm
code/modules/reagents/reagent_containers/hypospray.dm
html/changelogs/.all_changelog.yml
|
2015-05-30 16:11:57 +02:00 |
|
Zuhayr
|
c5df326533
|
Fixes #9414
|
2015-05-30 03:15:19 +09:30 |
|
Zuhayr
|
3cf0018fb8
|
Fixing up bed icons etc.
|
2015-05-30 01:13:11 +09:30 |
|
Zuhayr
|
93aaa48cd8
|
Fixes #9571, various other tweaks.
|
2015-05-30 00:59:39 +09:30 |
|
Zuhayr
|
e9f2f5cf55
|
Converted comfy chairs to material system, cleaned up colours/icons.
|
2015-05-30 00:45:36 +09:30 |
|
Kelenius
|
5be2bd6a1b
|
Updates to properly DA materials
|
2015-05-23 15:21:11 +03:00 |
|
Zuhayr
|
a6f59edc22
|
Bit of documentation.
|
2015-05-20 14:00:14 +09:30 |
|
Zuhayr
|
8ce787ef68
|
Final tweaks to recipe availability and material inheritance.
|
2015-05-17 18:22:21 +09:30 |
|
Zuhayr
|
ed34aa2466
|
Rebalancing and adjusting divisors for all weapon damage values.
|
2015-05-17 16:51:55 +09:30 |
|
Zuhayr
|
a540e97e1b
|
Stool and table tweaks, adjusted tables on the map.
|
2015-05-17 13:41:22 +09:30 |
|
Zuhayr
|
4cd2a5a532
|
Updating stools/stool padding.
|
2015-05-17 12:53:23 +09:30 |
|