Commit Graph

276 Commits

Author SHA1 Message Date
Alberyk 76b743a986 Adds the Aut'akh unathi (#5919)
* Base work for the unathi robot subspecies.

* Adds metabolism species, kidney vars, and the robot unathi organs.

* Moves some action buttons to organs, pretty much a bay port right now. Todo: the unathi and alien stuff should also go here.

* First autakh implant power.

* Fixes the organs action button this time.

* Finishes more implants, and interactions with flashs and vaurca.

* Prepare for great changes.

* Drops the real bomb, boss.

* He who fights with monsters.

* Far more work into augments and limb removing powers.

* Limb verbs should be good now.

* A LOT of work into the assited organ, allowing it to bleed and etc, as well adding a new chem that will stop bleeding in their case.

* Probably the last work on implants.

* Some extra touches.

* Some tweaks to the species.

* More fixes and adds kyre's sprites.

* More runtime fixes.

* Fixes the species name too.

* Fixes travis.

* Updates this file too to work with the new tools procs.

* Adds changelog

* Fixed changelog.

* Unathi hair and lore description.

* Some tweaks to this too.

* Locks away them for now, they will be released after we got all the events and etc done.

* Changes this chemical.

* Fixes an airlock runtime.

* Adds the non scan flag to the autakh, mostly due to some bizzare interactions with changelings and cloning.

* Organs removal changes; can't take out the organ if it is too damage.

* Restricts them back again.

* Robotic organs now have the proper icons and names.

* Adds sprites for their organs and some extra tweaks.

* Fixes this missing icon.

* emp should also now hurt assited organs.

* Tweaks more organ related things.

* Fixes the head not being properly set as well.

* Fixes their flags.

* fixes the flag for real this time.

* Poze's review.

* Changes the au'takh organ buttons to don't be animated.

* Helps with adminbus or something.

* Fowl's requested changes.

* Fixes a typo.

* Robotic limb's brute and burn mods are now controlled by the limb model.

* Fowl's changes once more.

* Stops some spam.

* More grammar.

* No eal.

* Skull's review.
2019-01-23 19:27:44 +01:00
Mykhailo Bykhovtsev 70824906c5 Live Animal Traps (#5744)
In summary:

changes path of beartrap to make it a generic trap

Updated paths everywhere

Adds small trap, can capture mice, lizards, chick and spiderlings.

Adds medium trap, can capture cat, diyaab, monkey, yithian, pengiuns, chicken, nymph. Sometimes even maintainence drones, spiderbots and PAi.

Adds large trap, that is dense object. It cannot be picked up and releases animal in the opposite direction from a user. It can capture: medium size animals like dog, spider, carp, goat, cow, shark, fox, bear, cavern dwellers, and other kinds of Xenomorphs.

Adds medium trap, can capture Medium-sized mobs such as Diyaabs, Cats, Monkeys, Yithians(?), Nymphs, the occasional wandering pAI and Maintenance Drones.
2019-01-07 00:16:02 +02:00
Alberyk 59be553606 Material door updates: lock and damage (#5659)
-ported locks and keys from baystation
-fixed the simple door damage interaction, now you can properly destroy it and etc
2018-12-08 21:40:06 +01:00
Mykhailo Bykhovtsev 7055f4f6cf Surge prevention module balance (#5163)
So I was given input by the community that new IPC and borg surge modules are kinda useless. As they only provide 1-3 EMP protections given that ION rifles are 10 shots charge, and that IPC costs 14 TC which is more then half of traitor uplink. And borgs surge cost too much in resources to build. I expected that, so now I think I want to buff it.

IPC surge module now costs 12 TC(as opposed to 14).

comes in with 2-5 EMP protections which is RNG based.

Borg's surge module built cost in gold and silver was reduced by 50% from 10000 G and 15000 S to 5000 G and 7500 S.

Borg's surge module comes in with 2-5 EMP protections which is RNG based

Also I made surge's nanopaste to look fancier 💯
2018-08-27 23:13:22 +03:00
Mykhailo Bykhovtsev dd4efb5a27 EMP resistance items (#4995)
Adds cyborg heavy surge prevention module as an upgrade by robotics. It is expensive to make, requires a bit high tech, and can protect cyborg for 1-3 EMP pulses which is purely random when module is installed.

Adds IPC surge prevention module via antag uplink. The module comes in the form of modified red nanopaste that only interacts with IPCs. Like cyborg module it gives EMP protection for 1-3 pulses which is purely random by nanopaste. Can be used only once per paste. Cost for it is 14 telecrystals(idk if need to bump it higher, idea is that you can't buy two of them as traitor).

adds sprite for new nanopaste with surge module.

Cleans up some code in files I worked on.

Fixes bug where destroyed cyborg components would vanish. Fixes #5000
2018-08-04 21:14:32 +03:00
Alberyk 187613428e Adds some random asteroid dungeons (#5052) 2018-08-03 22:46:06 +02:00
Alberyk 207608b60c Ports some sounds from baystation (#4675)
This pr ports some sounds effects from baystation12, it has sounds for:

-using medical items
-using hyposprays
-opening some storages, like briefcases and toolboxes
-lighting matches
-magboot activation sounds
-holster sounds
-tape sounds
-pen and stamp sounds
2018-05-02 00:20:56 +03:00
Alberyk 5c78e4fc08 Adds stabbing wounds (#3970)
-ports stabbing wounds for baystation, so things like bullets and other pointy things will not cause cuts.
2017-12-23 21:07:54 +02:00
Alberyk e0ce06ddaf Adds a delay when using nanopaste and more (#3955)
-added a delay when using nanopaste
-nanopaste can't be used through spacesuits anymore
2017-12-08 15:21:37 +01:00
osiato a0e801d5c7 Fixes Aurora3 issue 3498, which was a typo with the text when nanopaste is self used by an IPC and observed by another person. (#3504)
Which was a typo with the text when nanopaste is self used by an IPC and observed by another person.

There were 2 issues,
There was no space after a terniary function, causing a grammatical error.
Another grammatical error was caused due to the else block of the terniary function being defined as " \the", which was processing as \t he (tab he) and causing results such as he Hephaetus instead of the Hephaetus.

fixes #3498
2017-10-23 16:10:14 +03:00
Ron 905c960e52 Adds some things (#3357)
- Power Sword
- Tesla Gun
- Gravity Gun
- Pipe Wrench
- Slime baton - Awaiting Sprite
- Hand-held crew suit monitor
- Space Klot
2017-09-02 18:16:22 +02:00
Ron cb5e227320 Converts some istype's to use helpers (#3224)
Converts various istype's to use helpers. Mainly:
Cable
Wrench
Screwdriver
Multitool
Crowbar
Wirecutter

And makes the helpers defines.
2017-08-06 22:08:42 +03:00
Ярослав 4e8ee11c6e Robotics module packs overhaul (#2880) (#2949)
Reposting from PR #2880 because of branches conflict

Finally did find a way to add blueprints to construction cyborg. Engineering cyborg modules are now more related to construct things inside of an area, while construction cyborg is now have all tools which might be needed to create new areas (+APC's, air alarms and such). A bucket and a matter decomplier to a janiborg.
Maint.drones did receive their wires limit being lowered from 30 to 15, wood and plastic dispensers capacity is multiplied by 2, and a standart engi module pack is now contains 45 wire length instead of 30
2017-07-15 16:25:44 +03:00
Lohikar c8fde7832f Add floor catwalks (#2786)
Adds floor-mounted catwalks, a special variant of catwalks that can be placed on regular turfs without deleting themselves.
Constructed with 4 rods from the rod construction menu, and are layered above wiring and power terminals. Can be disassembled with a welder, or (un)anchored with a screwdriver.
2017-06-22 13:22:12 +03:00
Lohikar 521705dc62 Soft-delete fixes & Tajara Coffee overdose tweak (#2749)
changes:

Fixed issues with parallax objects not deleting properly due to hanging refs. (this also seems to fix some mob delete failures, like BSTs)
Fixed issues with hyperzine, inaprovaline, and synaptazine not soft-deleting due to hanging modifier references.
Removed coffee overdoses poisoning Tajara at Mofo's request.
2017-06-18 13:35:24 +03:00
Lohikar 4cf407ea33 More stack icons (#2654)
Top is a stack over 2/3 full, middle is between 1/3 and 2/3 full, bottom is under 1/3 full.

Also converted stacks to use Initialize().

affected stacks:

Ointment
Bandages
Steel Sheets
Plastic Sheets
Glass Sheets
Plasteel Sheets
Reinforced Glass Sheets
Leather
Wet Leather
Hide
Sprites from /tg/.
2017-06-10 09:30:18 +03:00
Lohikar 3be27b9efa Merge SSnanoui & Nanomanager (#2427)
Merges the NanoUI subsystem with Nanomanager, as well as cleans up some nanomanager code.
Most of the files in this commit are changed as a result of removing the nanomanager global in favor of the SSnanoui global.
2017-05-23 16:33:00 +03:00
skull132 efee411ad7 Merge branch 'master' into development
# Conflicts:
#	code/modules/modular_computers/computers/modular_computer/damage.dm
2017-05-20 19:18:35 +03:00
Ron 5de06206e7 More bug fixes (#2305)
Fixes #2296
Fixes #1904
Fixes #2303
Fixes #2285
Fixes #1753
Fixes #1649
Fixes #789
Fixes #1779
2017-05-20 18:41:26 +03:00
LordFowl 3c64b62c27 New Map Mining (#1935)
* Alpha Commit

* Alpha Commit

* Seconds

* Some Commit

* Final Commit

* Fixing minedrone synth ID

* Dance Fever

* Fixing Travis part 1

* Satisfying the demands

* Stuff

* Sub-final commit

* Sculpting update

* more sculpting. pr is 99% sculpting, in fact

* kkk

* brightness_off

* swjaugyuwvhuw
2017-03-22 18:14:37 -04:00
Alberyk 59584ae772 Tray, paper bin and bottle fixes (#1631)
- Fixes #1630 
-fix juggernauts breaking the shit out of door real fast
-fix trays having literaly no delay when smacking someone with one
- Fixes #1628 
-changes the recipe of sbiten, because it makes literaly zero sense for it to use vodka instead of mead, also added a bottle of it, spritted by datberry
-fixed bottles spawning without a name and icons on the cargo spawn, the base objects for bottles are just empty bottles now
-fix missing eye tape on mob sprite
-remove the last bit of "you can't fire a gun on help intent"
2017-01-23 23:41:33 +02:00
Alberyk 37f8366b62 Baymerge fixes and custom items tweaks (#1515)
-fix missing bottles sprites
-fix some things related to custom items sprites and desc
-fix missing syndicate cyborg
-add delay to repairing robotic limbs and using first aid items
-allows sprints to be applied to hands and feet
-nanopaste can be used on robotic limbs, not only surgery
-fix #1512
-fix cargo maglocks beind centcom ones
-fix hardsuit vision restrictions not working as intended
-fix webbing being able to hold medium items
2017-01-11 23:01:43 +02:00
Alberyk 1c17f110ee Fixing hides and accessories/custom loadout changes (#1404)
-fix all the issues related to the leather things, as in they been just metal sheets, by adding leather materials and some things you can build with them.
-add a carp and corgi costume
-add some new accessories, like a new holster, the atlas armband that everyone wanted and some new medals
-add more things to the custom loadout, like the tracksuit things
-turns the waistcoat and suspender into accessories too
-fix the captain's medal at spawn being utter fucking broken
-add xeno sprites for the hazard suit
-add some more things to the cargo warehouse, like hides and winter coats
-replace force gloves sprites with cake's version
-add more jumpsuits that you can roll up sleeves
-stun from tabling someone is random now instead of a fixed ammount
2017-01-07 13:00:22 +02:00
NanakoAC 6cef8c9074 Attack Proc fixes (#1259)
Baymerge changed the attack proc, i think by removing a default value, and a lot of things broke because they weren't using the function correctly.

This proc does three main things.

Adds a default to /obj/item/proc/attack to target the chest when no target zone is supplied.

Fixes the lack of a target zone in many attack procs, properly defining it so it'll get passed to the parent, and ensure that bodypart-specific targeting works.

Removes most instances of code to retrieve the user's selected zone, and instead to use the zone passed into the attack function. saves duplication of effort.
2016-12-24 03:34:23 +02:00
skull132 9b094ad0eb Merge branch 'upstream/development' into development
# Conflicts:
#	code/_helpers/time.dm
#	code/game/objects/items/devices/floor_painter.dm
#	code/game/objects/items/stacks/medical.dm
#	code/global.dm
#	code/modules/cargo/randomstock.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/paperwork/faxmachine.dm
2016-12-18 01:06:45 +02:00
NanakoAC 182d4375be Animal healing fix (#1162)
Fixes animal healing with food, which i broke a couple patches ago, and healing animals with medical kits, which has never really worked right

I tweaked the heal values on the kits slightly, this wont make much difference to healing humans, only to healing animals.
Also added a doafter thing to make it a tiny bit more involved.

Also adds a little text for animals to make it visible on examination if they're wounded
2016-11-18 22:03:43 +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
skull132 87e041aa75 Merge remote-tracking branch 'bay12-upstream/master' into development 2016-10-07 00:58:39 +03:00
Bedshaped f0df1746f8 Bedshaped's Best Bugfixes #1 (#654)
Fixes #505 (again)
Fixes #626 
Fixes #647 
Resolves #509
2016-08-02 21:47:37 +03:00
Alberyk a53cb0e373 Adding costs to nanopaste (#567)
No more free nanopaste.
2016-07-12 18:30:20 +03:00
skull132 17938853d5 Of Helper Procs & Dumbs
Makes a mob/proc/can_use_hand(), which determines whether or not a mob can use a given hand.

Redefined in human.dm to check a hand's status and usability.
2016-03-25 20:33:10 +02:00
skull132 3d90716324 Reworking hand usability checks; Fixes #200
Hand usability checks are moved into `mob/living/carbon/human/put_in_l_hand()` and `put_in_r_hand()` respectively. This changes how `obj/item/attack_hand()` functions slightly.
2016-03-25 17:32:49 +02:00
Atlantis 9d98c4ab2a Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 2016-01-16-robotchanges 2016-01-16 13:03:26 +01:00
Atlantis dd74c30b58 Replaces Construction module
- Construction module merged back into Engineering module.
- RCD is not available by default. It is now an upgrade, as is the jetpack for mining module, etc.
- Matter synth capacities adjusted a bit. Steel increased from 40 sheets to 60 sheets. Originally (before matter synths were introduced at all) engiborgs had approx. 100 sheets worth of materials. Plasteel increased from 10 sheets to 20 sheets since rwalls require 4 sheets, instead of 2 for quite some time now.
- Adds possibility to install a matter bin into cyborg. Matter bin multiplies cyborg's material capacity. Obviously this is most useful for engineering borgs. Default multiplier is 1, regular matter bin has 2, advanced matter bin 3 and super matter bin 4.
2016-01-16 12:38:02 +01:00
PsiOmegaDelta dcfe907ff0 Makes it possible to convert uplink TCs into physical form.
These crystals can be inserted into active uplinks, making it possible to trade them.
Variant of https://github.com/ParadiseSS13/Paradise/pull/3174/files.

The uplink now always shows the description to avoid annoying button shifting.
2016-01-11 16:58:42 +01:00
Hubblenaut 3127ee28b5 Fixes subcategories of floor tiles not being placable 2015-12-11 11:08:36 +01:00
mwerezak fa6c8415ea Adds click cooldowns to common healing and repair actions 2015-12-06 00:23:49 -05:00
PsiOmegaDelta 55f6c1c0b5 Merge pull request #11204 from Hubblenaut/medical
Bruise Packs, Changes and small Fixes
2015-10-19 16:17:16 +02:00
Hubblenaut cbd0972bfa Bruise packs are used per wound and take time to apply 2015-10-16 16:36:04 +02: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
PsiOmegaDelta 27feb09a31 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/machinery/computer/computer.dm
	html/changelogs/.all_changelog.yml
2015-10-11 17:37:01 +02:00
PsiOmegaDelta 070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
2015-10-11 17:17:41 +02:00
PsiOmegaDelta bd7c475fcc Stack material use now depends on charge costs.
This ensures one does not have to remember to set uses_charge equal to the length of the charge_cost list. Fixes #10943.
2015-10-08 20:29:39 +02:00
PsiOmegaDelta 8a1b414e28 Floor painter, turf, and decal tweaks.
Makes several custom color definitions, utilized by the floor painter, floor tiles, decals, etc.
Colored floor turfs now use a white icon state and applies a color, similar to the corresponding decals. This ensures they have the same color tone (was slightly off previously).
Colored floor tiles also use a white icon state and color application.
Removes now unused item states.
2015-09-21 15:14:13 +02:00
PsiOmegaDelta 9057655da6 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/clothing/spacesuits/void/void.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/silicon/ai/ai.dm
2015-08-24 10:31:30 +02:00
PsiOmegaDelta c376c08cc0 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/structures/girders.dm
	code/modules/mob/living/carbon/human/human_damage.dm
2015-08-24 10:23:12 +02:00
mwerezak 13c760c5bb Fixes #9453 and fixes #10614 2015-08-22 11:09:17 -04:00
Zuhayr 3f833f2b24 Reimplemented floor lights as a machine built at the autolathe. 2015-08-16 19:26:17 -07:00