Zuhayr
a8b801b377
Added supply beacon.
2015-08-13 16:59:18 +09:30
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
3e6889927e
Fixes #10500
2015-08-12 15:26:57 -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
76571bf758
Fixes #9646
2015-07-09 03:29:24 +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
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
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
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
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
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
Zuhayr
14df1e5fb5
Converts beds, chairs and stools.
2015-05-17 03:43:59 +09:30
Zuhayr
ae3ad84634
Updated ashtrays and mineral doors.
2015-05-17 03:02:03 +09:30
Zuhayr
358867f3b5
Major sheet and material refactor.
2015-05-17 01:46:53 +09:30
Zuhayr
8aa24b86bb
Renamed shards, katanas, claymores.
2015-05-16 20:36:33 +09:30
Zuhayr
966d797e07
Converts bat to use the material system.
2015-05-16 19:59:21 +09:30
GinjaNinja32
76654321e4
Merge remote-tracking branch 'upstream/dev' into new_tables
...
Conflicts:
code/setup.dm
2015-05-16 08:53:33 +01:00
Zuhayr
95ea7c110c
Fixes several wall issues.
2015-05-15 13:43:00 +09:30
GinjaNinja32
354859b889
Generalises shards, makes tables possibly create shards when falling apart, make tablesmash potentially give someone a faceful of broken glass if the table breaks
2015-05-15 04:47:18 +01:00
GinjaNinja32
a3662a9088
Fixes, improvements, suggestions.
2015-05-15 00:06:47 +01:00
GinjaNinja32
63f28ee0e0
Fixes
...
- Material comparisons done by name rather than reference equality
- get_material_by_name proc that ensures the material list is initialised, initialising it if neccessary
- holographic materials moved into main material list
- table frames are not a source of infinite metal, and can be deconstructed correctly
- gambling table icons are no longer E-W flipped
2015-05-14 22:26:19 +01:00
GinjaNinja32
5f65565f45
Bugfixes, removing the remnants of table_parts, changelog.
2015-05-13 20:40:00 +01:00
