Commit Graph

98 Commits

Author SHA1 Message Date
Matt Atlas
82437acd43 Materials subsystem, material defines instead of strings, structure materials. (#8447)
The shitcode crusade begins.
2020-03-18 20:19:11 +01:00
AmoryBlaine
3a8ffb19bb Firearm, Ammo, and Medical Storage Resprites (#8208) 2020-03-11 16:09:47 -03:00
mikomyazaki
21f348ec57 Adds a unit test to check for any missing initial icon states (#8332) 2020-02-23 02:43:12 -03:00
Geeves
931d56672a Uplink Revamp (#7974) 2020-01-15 18:28:11 +01:00
Werner
cb4a712851 Enforces Lineendings and adds Editorconfig (#7657) 2019-12-21 16:19:24 +01:00
Alberyk
a9d4e6ba5d Fixes some issues related to the pra away mission (#7488)
-fixes the commissar role not working properly, making some ghost roles check more robust
-fixes a couple of mapping errors on that space ruin
-fixes the nuclear launcher magazine not accepting the proper bullets
-fixes the cosmonaut suit not accepting tanks on the suit storage slot
2019-11-23 11:10:29 +02:00
Alberyk
beb35d6fd3 Adds two away missions ghost roles (#7450) 2019-11-21 20:55:59 +01:00
Alberyk
878f99f8a0 Adds emp interaction for simple mobs and some pra robots tweaks (#7314)
-ranged pra robots now leave behind empty casings after firing
-pra robots will now take honorary membership cards in consideration when chosing targets
-adds emp damage to synthetic simple animals
2019-11-04 09:11:17 +02:00
Alberyk
b0e6ece48b Gun update: the end of the space cold war (#6742)
-replaces the sprites of the guns that were pretty much justreferences to guns in real life, like the uzi and the dragunov, with new future sprites made by kyres
-adds the hand cannon
-makes some guns cheaper at the merchant
-fixes a broken message with the prank guns
-added a small animation when someone is hit by a blaster projectile
2019-07-24 21:31:09 +03:00
Alberyk
ad9caa77ae Adds a couple of lore themed mercenary gear loadout (#6644)
Adds a bit of what is related here: https://forums.aurorastation.org/topic/11941-antagonist-rework-20/

Pretty much, adds a couple of gear crates that mercenary teams, seeking to do a lore related gimmick, can buy by pooling their crystals. Right now, it is just adds a couple of human related factions, such as eridani, sol alliance, elyra and the frontier.
2019-07-04 21:13:17 +03:00
Alberyk
6393c26326 Adds a system for random explorable space sites (#6320) 2019-05-05 23:37:03 +02:00
Alberyk
5755810b34 Adds wielded laser rifle sprites, improves freezeray and tcfl guns (#6133) 2019-03-13 23:03:46 +01:00
OneOneThreeEight
1c22080e0f Changes to the traitor revolver (#5983) 2019-02-06 01:02:18 +01:00
Alberyk
176d66437b Replaces the tranquilizer rifle magazine with a box (#5952)
The head of security officer came with a magazine for the tranquilizer rifle, however the rifle did not accept magazines, and worked like the regular am rifle, where you have to load one shell at the time. This pr replaces the magazine, that forced you to empty it on the ground to load the rifle, with a regular box full of darts.
2019-01-27 17:32:22 +02:00
Alberyk
ed0297a697 The Tau Ceti Foreign Legion (#5779)
This pr adds the Tau Ceti Foreign Legion, at the request of the lore team, to replace/be an alternative to the ert.
2018-12-30 12:06:21 +01:00
Werner
0feedab118 Leyon Changes (#5200)
The Leyon Pistol has been changed to be closer to the original vision of it.
It is loaded via a special 10mm speedloader, however loading it takes some time.

Each gun (when ordered via cargo) will ship with a speedloader.
The speedloaders itself can not be ordered, but 10mm ammunition boxes can which can be used to restock the speedloaders or load the gun directly.

Reduces the price for the gun at the merchants from 1500 to 500 credits
And makes additional ammo boxes purchaseable

Also changes the path name of the 10mm ammo/mags/... to be consistent with the standard pathing for ammo
Adds additional messages if you can not load a gun with a single cartridge (currently it fails silently)
2018-09-16 00:46:52 +03:00
Alberyk
bf467f2fcd August bugfixes (#5096)
-removes the shotgun magazines things, not done properly by #5010
-fixes more secret chems showing up on cargo warehouse
-removes rainbow slime core, since there is no way you can get it, from the bounties
-fix the adhomian bread recipe
-removes the mining drone ore hunting behavior, which just ended with them falling down holes and other dumb things
-fixes #5097 by removing the bluespace leak ruin, since the bluespace walls had some bizarre interaction with simulated turfs in the asteroid, besides just pushing half of the loots into walls
2018-08-07 09:01:42 +03:00
Alberyk
047c3a4c83 Gun update 2018: mk II (#5010)
-removes the shotgun magazines, moving their sprites to the boxes instead
-shotguns boxes should now all have eight shotgun shells, up from seven
-added incendiary and emp shotgun shells boxes
-added the baindolier, a belt that can hold up to 16 shotgun slugs
-fixed a bug with unloading the pocket rifle
-added empty sprites for the uzi and a different loaded gyro pistol icon
-updates some gun related merchant lists a bit
-adds the weapon suggested by this thread: https://forums.aurorastation.org/viewtopic.php?f=18&t=11486
2018-08-02 01:01:26 +02:00
Alberyk
f90063b3b6 Adds the gatling machine gun (#4867)
This pr adds a backpack mounted minigun. That requires the user to wear the power source on their back to deploy the weapon and fire it. It can supply nearly enough dakka, but it robs the user of wearing a backpack, a rig or carrying anything in their other hand while firing. It can be brought with around 50 telecrystals.

Sprites are from tg station.

/wetgnow
2018-06-17 16:50:26 +03:00
Matt Atlas
58cf265cdd Makes the mateba great again (#4107)
Adds a new firing sound, new caliber (.454), new description all at the cost of one clumsily made PR!
2018-01-16 15:19:11 +02:00
WrongEnd
73a10d20e2 Adds pranks, jukes, and anal retentive bolt action rifles (#3664) 2017-11-10 23:53:01 -06:00
Alberyk
fb3ac0d718 Mounted guns names, grenades tweaks and projectiles changes (#3322)
-name added the prefix mounted to all mounted guns
-converted the hos sniper rifle bullet to the new armor system
-converted projectile/special.dm to absolute pathing
-reduced again the damage of frag grenades
-added armor penetration to the pulse beam, to make it more than just a stronger laser
-fixed the fake grenade getting stuck in the primed sprite after its detonation and added a indication it is take in the desc
2017-08-27 17:00:32 -05:00
Alberyk
b490769175 Adds netgun, haywire rounds and gun related fixes (#2456)
-adds the netgun, replacing the syndicate cyborg energy crossbow with a downgraded mounted version, and giving the heisters a chance of getting one of those in their random gun spawn
-fix the meteor gun, giving it a new sprite and fixing the wrong icon state on the projectile
-ports emp/haywire rounds from baystation, only .38 and 12 gauge rounds
-fix the action button of the am rifle not wielding it
-gives the wizard staffs tech levels
-removes the xray crate from cargo
Fixes #1923
2017-05-29 22:41:38 +03:00
Alberyk
2c280c8341 Mandatory gun update (#1685)
-added new sprites for rubber and rifles casings
-made bullets path less dumb
-added some new gun sprites, like the large crossbow and zipguns
-added a new tatical sprite mask, with support for unathi, tajaran and vox
-added back sprites for some items like bats and scythes
-fixed being able to saw off sawn-off shotguns forever and ever
-fixed a typo on the custom loadout
-nerfed the brain damage of the mind flayer, since brain damage is lethal now
2017-02-04 00:11:34 +02:00
Alberyk
cf62782e64 Baymerge master fixes and additions (#1455)
FIxing lamarr cage having no click cooldown when being smashed.
Fix other missing cooldown checks in some other places
Fix #1448
Fix spiders egg implantation being borked
Fix #1458
Fix some issues with the bulldog sprites
Fix #1444 by replacing the regular vault with one with random loot, but, loaded with valuable/rare items instead of just junk
2017-01-08 12:03:08 +02:00
LordFowl
bc8871ac2b Shells and Periphery (#1327)
Adds Shells. Adds tags. Adds IPC subspecies. Adds HK-47's. Does not add IPC construction.

Beyond the obvious review of shells, the exact stats of the IPC subspecies need review. They were largely an afterthought, and quickly overshadowed by the shell project.
2016-12-28 02:23:26 +02:00
Alberyk
871b2dc302 Unathi alt language and more fixes (#1299)
-added an alt unathi language, at jackboot's request
-added an automatic shotgun weapon
-fixed rifles having the wrong delay when not wielded
-fixed non-lore friendly ipc limbs
-fixed #1292
-fix syndicate borgs not having the right assigned mind
2016-12-25 20:51:15 +02:00
printer16
70e30d0f43 Fixed ERT Update (#1266)
Credits for content go to Serveris. All I did was fix it up for the baymerge and got it working in-game (Yes I know zipties don't stack. I couldn't figure it out. Maybe latter.)
2016-12-23 02:09:49 +02:00
skull132
cdd4772177 Merge branch 'master' into merge/level_dev_master
# Conflicts:
#	code/game/machinery/vending.dm
#	maps/exodus-1.dmm
#	maps/exodus-2.dmm
2016-12-19 00:23:19 +02:00
Alberyk
de74140f89 Fixing mechanical traps and portable flashers (#1173)
Traps will trigger don't matter if you are walking or running, same with portable flashers.

Also, fixing a missing shotgun box sprite and a the wrong gun in the supply cargo crate.
2016-11-21 12:06:51 +02:00
Alberyk
38a0033b2e Fixing compile errors (#8)
* Fixing more errors

* Update baystation12.int
2016-11-12 12:47:43 +02:00
skull132
ee68f3c9d0 Final merge
Merge branch 'development-2' into development

# Conflicts:
#	baystation12.dme
#	code/_helpers/icons.dm
#	code/controllers/master_controller.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/computer3/laptop.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/floorlayer.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/mech_fabricator.dm
#	code/game/objects/effects/decals/contraband.dm
#	code/game/objects/explosion.dm
#	code/game/objects/items/robot/robot_upgrades.dm
#	code/game/objects/items/weapons/melee/misc.dm
#	code/game/objects/items/weapons/storage/boxes.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/window.dm
#	code/modules/clothing/spacesuits/rig/rig.dm
#	code/modules/clothing/suits/jobs.dm
#	code/modules/mob/freelook/update_triggers.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/human_movement.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/species.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/projectiles/ammunition/boxes.dm
#	nano/templates/sleeper.tmpl
2016-11-12 00:10:21 +02:00
skull132
e9b688e1f6 Merge branch 'development-2' into development
Christ on a stick. SO MANY ERRORS. REEE.

# Conflicts:
#	baystation12.dme
#	code/_helpers/lists.dm
#	code/_helpers/logging.dm
#	code/_helpers/text.dm
#	code/_onclick/click.dm
#	code/controllers/configuration.dm
#	code/controllers/master_controller.dm
#	code/datums/supplypacks.dm
#	code/game/antagonist/antagonist.dm
#	code/game/antagonist/antagonist_print.dm
#	code/game/antagonist/outsider/commando.dm
#	code/game/antagonist/outsider/ninja.dm
#	code/game/area/areas.dm
#	code/game/gamemodes/cult/cult_items.dm
#	code/game/gamemodes/game_mode.dm
#	code/game/jobs/access.dm
#	code/game/machinery/atmoalter/canister.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/mecha/mech_fabricator.dm
#	code/game/mecha/mecha.dm
#	code/game/objects/effects/spiders.dm
#	code/game/objects/items.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/flash.dm
#	code/game/objects/items/devices/lightreplacer.dm
#	code/game/objects/items/devices/paicard.dm
#	code/game/objects/items/devices/scanners.dm
#	code/game/objects/items/devices/suit_cooling.dm
#	code/game/objects/items/devices/uplink.dm
#	code/game/objects/items/robot/robot_upgrades.dm
#	code/game/objects/items/toys.dm
#	code/game/objects/items/weapons/cards_ids.dm
#	code/game/objects/items/weapons/handcuffs.dm
#	code/game/objects/items/weapons/manuals.dm
#	code/game/objects/items/weapons/material/kitchen.dm
#	code/game/objects/items/weapons/material/misc.dm
#	code/game/objects/items/weapons/material/swords.dm
#	code/game/objects/items/weapons/melee/energy.dm
#	code/game/objects/items/weapons/melee/misc.dm
#	code/game/objects/items/weapons/scrolls.dm
#	code/game/objects/items/weapons/storage/belt.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/tools.dm
#	code/game/objects/objs.dm
#	code/game/objects/structures/crates_lockers/closets.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/janicart.dm
#	code/game/sound.dm
#	code/game/turfs/simulated.dm
#	code/game/verbs/ooc.dm
#	code/global.dm
#	code/modules/admin/verbs/debug.dm
#	code/modules/admin/verbs/modifyvariables.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/head/hardhat.dm
#	code/modules/clothing/head/helmet.dm
#	code/modules/clothing/head/jobs.dm
#	code/modules/clothing/head/misc_special.dm
#	code/modules/clothing/shoes/jobs.dm
#	code/modules/clothing/spacesuits/alien.dm
#	code/modules/clothing/spacesuits/captain.dm
#	code/modules/clothing/spacesuits/miscellaneous.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces.dm
#	code/modules/clothing/spacesuits/rig/suits/alien.dm
#	code/modules/clothing/spacesuits/spacesuits.dm
#	code/modules/clothing/spacesuits/void/merc.dm
#	code/modules/clothing/spacesuits/void/void.dm
#	code/modules/clothing/suits/armor.dm
#	code/modules/clothing/suits/jobs.dm
#	code/modules/clothing/suits/storage.dm
#	code/modules/clothing/suits/utility.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/clothing/under/jobs/security.dm
#	code/modules/economy/Events.dm
#	code/modules/economy/Events_Mundane.dm
#	code/modules/economy/economy_misc.dm
#	code/modules/events/blob.dm
#	code/modules/events/event.dm
#	code/modules/events/event_container.dm
#	code/modules/events/event_manager.dm
#	code/modules/events/money_lotto.dm
#	code/modules/events/prison_break.dm
#	code/modules/events/spacevine.dm
#	code/modules/hydroponics/trays/tray.dm
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/emote.dm
#	code/modules/mob/holder.dm
#	code/modules/mob/language/station.dm
#	code/modules/mob/living/bot/cleanbot.dm
#	code/modules/mob/living/carbon/alien/diona/diona.dm
#	code/modules/mob/living/carbon/alien/diona/diona_attacks.dm
#	code/modules/mob/living/carbon/give.dm
#	code/modules/mob/living/carbon/human/emote.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/outsider/vox.dm
#	code/modules/mob/living/carbon/human/species/station/golem.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/carbon/metroid/metroid.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_defense.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/admin.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/drone/drone.dm
#	code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
#	code/modules/mob/living/silicon/robot/emote.dm
#	code/modules/mob/living/silicon/robot/robot_items.dm
#	code/modules/mob/living/silicon/robot/robot_modules.dm
#	code/modules/mob/living/silicon/silicon.dm
#	code/modules/mob/living/simple_animal/bees.dm
#	code/modules/mob/living/simple_animal/friendly/cat.dm
#	code/modules/mob/living/simple_animal/friendly/corgi.dm
#	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
#	code/modules/mob/living/simple_animal/friendly/mouse.dm
#	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/logout.dm
#	code/modules/mob/mob.dm
#	code/modules/mob/mob_grab_specials.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_alien.dm
#	code/modules/organs/organ_external.dm
#	code/modules/paperwork/faxmachine.dm
#	code/modules/projectiles/ammunition/boxes.dm
#	code/modules/projectiles/ammunition/bullets.dm
#	code/modules/projectiles/guns/energy/nuclear.dm
#	code/modules/projectiles/guns/energy/rifle.dm
#	code/modules/projectiles/guns/energy/special.dm
#	code/modules/projectiles/guns/projectile.dm
#	code/modules/projectiles/guns/projectile/automatic.dm
#	code/modules/projectiles/guns/projectile/pistol.dm
#	code/modules/projectiles/guns/projectile/revolver.dm
#	code/modules/projectiles/guns/projectile/shotgun.dm
#	code/modules/projectiles/projectile/bullets.dm
#	code/modules/projectiles/projectile/special.dm
#	code/modules/reagents/reagent_containers.dm
#	code/modules/reagents/reagent_containers/food/drinks.dm
#	code/modules/research/designs.dm
#	code/modules/research/destructive_analyzer.dm
#	code/modules/research/rdconsole.dm
#	code/modules/spells/artifacts.dm
#	code/modules/spells/spellbook.dm
#	code/modules/tables/tables.dm
#	code/world.dm
#	config/example/config.txt
#	icons/mob/items_lefthand.dmi
#	icons/mob/items_righthand.dmi
#	icons/obj/lighting.dmi
2016-10-31 00:01:52 +02:00
Alberyk
479666a47d Random maint loot and miscellaneous things (#1052)
Things done:
Created several random objects, that can be used to randomize loot in the maint or other places. Several items, some rare things and other random useful or not objects.
Added a svd gun with its own snowflakness, to replace the heister's lwap, but, they will get an extra energy gun to compesate.
Added tracksuits, stunrod, new sprite for the rapier, a new sword flavor and the old cane sword.
Changed the heister ship armory; two random melee weapons, the dragunov with an extra mag and a random energy gun.
Changed the chances of ghetto guns going bad.
Replaced the carbines in the ert area with energy pistols, so, they can make use of the holsters.
Clumsy people may have trouble with glowsticks now.
2016-10-26 20:29:38 +03:00
LordFowl
660a5d0063 Miscellaneous Content Patch (#1002)
rscadd: "Added three new energy-based weapons, one designed purely for pest-control."
rscadd: "Added a new rare handpistol, based off of a proposed competitor to the NT Mk58."
rscadd: "Added a new pet for the Head of Security - the PTR-7 Tranquilizer Rifle."
rscadd: "Syndicate manhack delivery grenades are now available via the traitor uplink."
rscadd: "Manhacks will no longer attack anyone belonging to the 'syndicate' faction, including Heist pirates."
tweak: "Tweaked loadout customisation whitelists, generally making them more restrictive by role."
bugfix: "It is no longer possible to be older or younger than your species ought to be."
2016-10-22 23:26:42 +03:00
Alberyk
04fbeddf36 Compile errors round 2 by Alberyk (#3) 2016-10-15 21:53:09 +03:00
skull132
87e041aa75 Merge remote-tracking branch 'bay12-upstream/master' into development 2016-10-07 00:58:39 +03:00
Alberyk
882f990cc7 Fixing missing in-hand laser cannon sprite (#1001)
The laser canon, the rifle one, is missing in hand sprite, this should fix this issue.
Also, some shotgun slugs using the wrong wasted sprite.
2016-09-25 17:29:30 +03:00
Alberyk
080bf5c1cb Returning the old laser rifles, energy pistols, carbines and much more (#860)
In this update:

Returning old e-rifles from old code.
Changing regular energy gun to energy carbine
Adding back the energy pistol
Buffing a bit the heavy asset protection suit, and fixing more loadout related issues with the nt and syndicate assault teams
Reworked a bit the syndicate commando and deathsquad loadouts
Returning shotgun boxes, that works like speed loaders, from old code, now with unique sprites
Stun batons now emit light
2016-09-07 10:11:48 +02:00
LordFowl
56e288e910 Vaurca Content 2 (#426)
Vaurca hivemind language added.
Vaurca appropriate name generator added.
Tied Vaurca language to their neural socket organ.
Added a method for non-Vaurca to intercept the Vaurca hivenet so long as they construct the correct item.
Sprites for Vaurca organs.
Neutered all Vaurca.
Cutting open a Vaurca for surgery now requires heavier equipment.
Injecting a Vaurca with a syringe now will take time.
Adds various Vaurca cosmetic items available via loadout.
Adds a few new burst-fire weapons exploiting the burstfire fix - obtainable via research or adminbus.
Ports the ability to stick heads on spears from Paradise-code.
Added an error message when trying to bite someone before the cooldown expires.
Removed spoken Vaurca language.
Heavily nerfed K'ois' properties.
Halved the nutrition value of nutriment, returning it to old-code state.
Nerfed the damage dealt by bite, while reducing the cooldown.
Fixed burstfire weapons spamming attack messages when fired, allowing for more automatic weapons.
Fixed Vaurca player ability to select coloured eyes.
2016-06-24 14:55:44 +03:00
Alberyk
36cacd28a4 Gun update (#387)
This pull adds bolt actions rifles, they are like pump shotguns, with the capacity for 5 7.62mm bullets.
Also adds a 7.62mm clip in the hacked autolathe. Raiders have a chance to spawn with one.
2016-06-23 02:16:57 +03:00
Chinsky
b01a41d766 Merge branch 'capgun' into russian_roulette 2015-08-14 06:03:33 +03:00
Chinsky
328621b860 Moved cap guns to proper guns. 2015-08-14 05:51:29 +03:00
Dragor
697157a6bc Changes all gun names to generic descriptive names, moves names into desc. Updates the descriptions of various guns to be more loreful. 2015-07-15 22:08:21 -04:00
mwerezak
3906989eac Mostly removes creation of throwaway objects from chameleon items
- Replaces the creation of throwaway items from New() with initial() calls for all chameleon items.
- Unfortunately throwaway items could not be removed when switch appearance, as initial() does not work very will with list vars.
- Makes chameleon item name cache lists global.
- Makes chameleon guns a subtype of energy guns, removes chameleon magazines.
- Moves chameleon.dm to clothing module root
- Items without icon or icon_state are no longer selectable as chameleon appearances.
- Chameleon verbs go in their own panel.
2015-06-06 18:19:23 -04:00
Kelenius
35a20002c6 Merge branch 'dev' into ofResearchAndPrototypes
Conflicts:
	baystation12.dme
	code/defines/obj/weapon.dm
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha.dm
	code/game/mecha/mecha_parts.dm
	code/game/objects/items/devices/flash.dm
	code/game/objects/items/devices/powersink.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm
	code/game/objects/items/weapons/circuitboards/machinery/cloning.dm
	code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm
	code/game/objects/items/weapons/circuitboards/machinery/pacman.dm
	code/game/objects/items/weapons/circuitboards/machinery/power.dm
	code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm
	code/game/objects/items/weapons/circuitboards/machinery/research.dm
	code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm
	code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm
	code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm
	code/game/objects/items/weapons/flamethrower.dm
	code/game/objects/items/weapons/handcuffs.dm
	code/game/objects/items/weapons/kitchen.dm
	code/game/objects/items/weapons/shields.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/objects/items/weapons/teleportation.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/assembly/igniter.dm
	code/modules/assembly/infrared.dm
	code/modules/assembly/mousetrap.dm
	code/modules/assembly/proximity.dm
	code/modules/assembly/signaler.dm
	code/modules/assembly/timer.dm
	code/modules/assembly/voice.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/hydroponics/trays/tray_tools.dm
	code/modules/mining/drilling/scanner.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/ore.dm
	code/modules/mob/living/silicon/robot/analyzer.dm
	code/modules/power/rust/circuits_and_design.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/energy/laser.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/designs.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/protolathe.dm
	code/modules/research/rdconsole.dm
	code/modules/research/research.dm
	code/modules/research/server.dm
	code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
2015-05-20 11:50:28 +03:00
Zuhayr
495952ff5d Changed steel material name to a define. 2015-05-12 13:08:41 +09:30
Zuhayr
bc50ba5166 Merge resolution. 2015-05-11 11:47:24 +09:30
Zuhayr
dbf8e53020 Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores. 2015-04-26 12:53:26 +09:30
PsiOmega
4a35631af1 Attempts to save Yosh's code. 2015-04-25 16:39:09 +02:00