Hubblenaut
e41ad0c946
Reinforced Walls
...
Lowers amount needed for building a reinforced wall from a girder from
four to two sheets.
Gets rid of rod products from dismantling a reinforced wall.
Adds one more extra step for undoing the deconstruction.
2016-04-15 16:41:33 +02:00
Neerti
57b6fe7aa8
Merge pull request #1169 from Kelenius/fixesOnly
...
Axes old wire, fixes costs in lathe
2016-03-26 15:42:25 -04:00
Kelenius
e883863f4b
Merge branch 'master' into playingWithTravis
2016-03-23 17:12:11 +03:00
Kelenius
afbc235b96
Mob inventory cleanup
2016-03-15 16:39:40 +03:00
Kelenius
359889a15c
Axes old wire, fixes costs in lathe
2016-03-12 11:38:52 +03:00
Kelenius
3fdda5e8c5
Fixes issues travis found
2016-03-11 11:59:51 +03:00
Zuhayr
cbc506fd51
Removed xenomorphs.
2016-02-20 11:50:18 +10:30
Zuhayr
a628ae2a56
Removed the Vox Pox.
2016-02-20 11:24:19 +10:30
Zuhayr
7c3993b68b
Revert "Revert "Bay update.""
2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c
Revert "Bay update."
2016-02-07 16:07:05 +10:30
Zuhayr
e557a71fdc
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
2016-01-20 08:01:14 +10:30
Zuhayr
5313c6b67b
Added Nerf weapons to Cargo. Codersprites.
2015-12-24 22:05:10 +10:30
Zuhayr
f93ea6a78f
Tweaks to previous commits.
...
More tweaks to IPC fixes.
Merge resolution/compile fixes.
Further work on properly integrating, updating and fixing prosthetic options.
Repathed internal organs to organ/internal.
More work on full synthetics, changelings, overheating.
Working on getting organs to qdel properly and spawn properly when robotized.
Finalized some overheating values, added remaining prosthetic icons.
Finalizing the testing version of the full prosthetic bodies branch.
Added suit cyclers to the autolathe and map.
Fixing runtime errors.
Fixing errors.
Changelog.
Replacing limb and organ strings with constants.
Prevented brainless species from becoming full cyborgs.
Fixed issues with brain/MMIs renaming themselves inappropriately.
Various fixes and oversights.
2015-12-24 21:13:40 +10:30
PsiOmegaDelta
f382626075
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/asteroid.dm
code/game/verbs/ooc.dm
code/modules/admin/verbs/icarus.dm
code/modules/mob/living/silicon/robot/robot_items.dm
code/modules/projectiles/projectile/special.dm
code/modules/random_map/random_map.dm
code/setup.dm
2015-12-13 10:15:29 +01:00
Zuhayr
d5447d9e95
Fixes #10838
2015-12-10 10:23:49 +10:30
Hubblenaut
470d2bb54a
Fixes stack creation logic and return value
2015-12-04 15:49:31 +01:00
Neerti
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
PsiOmegaDelta
3fd28dd361
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
html/changelogs/.all_changelog.yml
2015-10-14 08:41:38 +02:00
PsiOmegaDelta
3fd172ee63
Merge pull request #11294 from Baystation12/master
...
Dev-freeze
2015-10-14 08:40:03 +02:00
Hubblenaut
1c8ec1a700
Fixes stack creation logic and return value
2015-10-11 22:02:05 +02:00
Atlantis
e0a70d24ba
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoronwindowsv2
2015-09-01 03:22:08 +02:00
Zuhayr
b702c81060
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap
...
Conflicts:
code/game/turfs/simulated/floor_types.dm
2015-08-22 03:57:12 +09:30
Zuhayr
3f833f2b24
Reimplemented floor lights as a machine built at the autolathe.
2015-08-16 19:26:17 -07:00
Zuhayr
f6df7df714
Added diona gestalt preset.
2015-08-13 16:59:37 +09:30
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
Atlantis
47f0b47c46
Borosilicate windows
...
- This is the second part of my PR that added phoron windows to protect the SM core from fires
- Borosilicate windows are heat resistant versions of regular glass windows. This PR renames them (from phoron windows/phoron glass/etc.) and adjusts the fire resistances
- They are no longer completely fireproof. Instead, all window types have fire resistance variables - maximal safe temperature and amount of damage taken if temperature exceeds this limit.
- Regular: 100C, Regular Reinforced: 750C, Borosilicate: 2000C, Borosilicate Reinforced: 4000C.
- Adds alloying recipe to make borosilicate glass. 2 sand + 1 platinum alloy.
2015-07-27 13:49:12 +02: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
