Commit Graph

165 Commits

Author SHA1 Message Date
Cael_Aislinn
0752ca2fff changed erroneous name in sec hardsuit, reverted some derpy chemistry merging
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-21 05:38:04 +10:00
Cael_Aislinn
20aa136a08 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	code/game/machinery/hydroponics.dm
	code/modules/reagents/Chemistry-Reagents.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-21 05:05:17 +10:00
cib
e181b90ca2 Bugfix: Fix metabolism rates for foods, drinks and sleep toxins. 2013-01-16 02:55:23 +01:00
Cael_Aislinn
70764ac039 tweaked some supply packs a bit, added formalwear and pizza supply packs, made supply packs organised and selectable by type in the order menu
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-15 23:20:00 +10:00
Cael_Aislinn
09a9c7458f runtime fixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-14 21:46:12 +10:00
Cael_Aislinn
1c9b04ec74 copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-14 21:07:16 +10:00
Cael_Aislinn
bdeb96b7e5 Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/__HELPERS/game.dm
	code/controllers/shuttle_controller.dm
	code/datums/datumvars.dm
	code/datums/supplypacks.dm
	code/defines/obj/storage.dm
	code/defines/obj/vending.dm
	code/defines/obj/weapon.dm
	code/defines/procs/command_alert.dm
	code/game/area/Space Station 13 areas.dm
	code/game/atoms.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/dust.dm
	code/game/gamemodes/events/miniblob.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/factions.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/gameticker.dm
	code/game/jobs/access.dm
	code/game/jobs/job/assistant.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/engineering.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/jobs/job_controller.dm
	code/game/machinery/alarm.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/computer/ai_core.dm
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/message.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/constructable_frame.dm
	code/game/machinery/doors/door.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/recharger.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/machinery/teleporter.dm
	code/game/machinery/wishgranter.dm
	code/game/mecha/mech_fabricator.dm
	code/game/mecha/working/ripley.dm
	code/game/objects/items.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/flashlight.dm
	code/game/objects/items/devices/radio/encryptionkey.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/medical.dm
	code/game/objects/items/weapons/cards_ids.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/hydroponics.dm
	code/game/objects/items/weapons/manuals.dm
	code/game/objects/items/weapons/secstorage/secstorage.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/items/weapons/storage/firstaid.dm
	code/game/objects/items/weapons/storage/kit.dm
	code/game/objects/items/weapons/storage/storage.dm
	code/game/objects/items/weapons/storage/toolbox.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
	code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/game/objects/structures/electricchair.dm
	code/game/objects/structures/extinguisher.dm
	code/game/objects/structures/watercloset.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/game/vehicles/airtight/airtight.dm
	code/game/vehicles/vehicle.dm
	code/global.dm
	code/modules/DetectiveWork/evidence.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/diagnostics.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/client/preferences.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/clothing/suits/miscellaneous.dm
	code/modules/critters/critter_defenses.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.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/silicon/ai/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_transformation_simple.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paperbin.dm
	code/modules/paperwork/pen.dm
	code/modules/power/cable.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile/revolver.dm
	code/modules/projectiles/projectile/change.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	code/modules/recycling/sortingmachinery.dm
	code/modules/research/designs.dm
	config/config.txt
	html/changelog.html
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/mob/ties.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	icons/obj/grenade.dmi
	icons/obj/projectiles.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-11 22:12:31 +10:00
d_h2005@yahoo.com
2855cd6237 Fixes issue 1211 - Invisible toasts were due to a naming mismatch. (step it up kor)
-New sprites for the border firelocks!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5514 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-11 05:58:21 +00:00
sieve32@gmail.com
d64186ec9b -Now instead of just giving an angry message, any living mob with a client and the nuke disk that hits a transition on Z1 on them will have their momentum reversed, effectively sending them back where they came from. (Dead and clientless mobs still have the disk deleted from them)
Fixes Issue 1183

-Most game-specific messages now print to all non-new_player mobs instead of the world, round-end reports are unchanged but request consoles and other announcements will not be heard by people in the lobby any more
Fixes Issue 1158

-Tweaked the temperature resistance of mechs to be more inline with current fires. Most mechs protect almost as well as a full fire suit, and the firefighter mech is just over 2x more effective
Fixes Issue 1027

-False-walls can no longer be fixed when on top of a dense turfs
Fixes Issue 1196

-Tweaked how damage was read for CPR and self-examining so you can't perform CPR on yourself at 100 damage
Fixes Issue 1202

-Made stun-glove construction use the cable/Use() instead of just amount-2, so you can no longer get 0 amount coils
Fixes Issue 1206

-Glass reagent containers and droppers now log attacks like syringes do, with the list of reagents
Fixes Issue 1234

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5508 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-10 19:07:02 +00:00
petethegoat@gmail.com
f363948dc6 Committing some of SuperSayu's misc patches: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11671
* Smart fridge smartly shows (x5)(x10)(x25)(All) vend options based on quantity stored
* Gateway fix: When the away mission gate is calibrated, you will come out facing south. Matters somewhat when walking through in an exosuit. Also one pedantic text edit.
* Drink volume estimation:
* * Moved "half-full" to 26%-66% rather than 25%-49%
* * Moved "almost full" to 67%-90% rather than 50%-111% (1/.9)

Also removed /obj/item/weapon/directions and /obj/item/weapon/paperscrap.
They've been replaced by /obj/item/weapon/paper/crumpled and /obj/item/weapon/paper/crumpled/bloody.
Updated 2.1.0 and all away missions.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5497 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-08 20:58:31 +00:00
petethegoat@gmail.com
11b17c4442 Committing suomynonAyletamitlU's storage item standardisation commit: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11746
Standardization of the object tree and some modified functionality.
Moved a lot of storage/*_kit and similar boxes to storage/box/* ; most of these can now be found in boxes.dm. First aid kits remain a separate item type.
Replacement Light boxes pick up lights (for example broken ones) when used on them
Moved weapon/secstorage to storage/secure
Moved plant bags, ore satchel, trash bag, and sheet snatcher to storage/bag, in bags.dm
Fixed reagent_containers and snacks to pass through attackby() so the use_to_pickup code works. This affects plant bags, trash bags, and pill bottles.
Dice packs are now pill bottles, and all pill bottles can pick up dice.
Added error handling to uplink/generate_menu() so that one mistyped string doesn't bork the whole syndie uplink menu, since strings cannot be type-checked at compile time.
Cigarette packs and crayon boxes are now storage/fancy, however they retain existing update_icon() code.
Added a comment to storage.dm so that future people know where to look for use_to_pickup and allow_quick_gather code.

Updated all maps.

I've tried to test this thoroughly but I wouldn't be surprised if there were a few lingering issues. Try not to panic if you encounter any.

Full (i think) list of changed paths:
/obj/item/weapon/storage/flashbang_kit	> /obj/item/weapon/storage/box/flashbangs
/obj/item/weapon/storage/body_bag_box	> /obj/item/weapon/storage/box/bodybags
/obj/item/weapon/storage/chemimp_kit	> /obj/item/weapon/storage/box/chemimp
/obj/item/weapon/storage/trackimp_kit	> /obj/item/weapon/storage/box/trackimp
/obj/item/weapon/storage/seccart_kit	> /obj/item/weapon/storage/box/seccarts
/obj/item/weapon/storage/handcuff_kit	> /obj/item/weapon/storage/box/handcuffs
/obj/item/weapon/cigpacket		> /obj/item/weapon/storage/fancy/cigarettes
/obj/item/weapon/storage/mousetraps	> /obj/item/weapon/storage/box/mousetraps
/obj/item/weapon/storage/PDAbox		> /obj/item/weapon/storage/box/PDAs
/obj/item/weapon/storage/id_kit		> /obj/item/weapon/storage/box/ids
/obj/item/weapon/storage/lightbox/mixed	> /obj/item/weapon/storage/box/lights/mixed
/obj/item/weapon/storage/donkpocket_kit	> /obj/item/weapon/storage/box/donkpockets
/obj/item/weapon/storage/beakerbox	> /obj/item/weapon/storage/box/beakers
/obj/item/weapon/storage/syringes	> /obj/item/weapon/storage/box/syringes
/obj/item/weapon/storage/gl_kit		> /obj/item/weapon/storage/box/rxglasses
/obj/item/weapon/storage/diskbox	> /obj/item/weapon/storage/box/disks
/obj/item/weapon/storage/stma_kit	> /obj/item/weapon/storage/box/masks
/obj/item/weapon/storage/lglo_kit	> /obj/item/weapon/storage/box/gloves
/obj/item/weapon/storage/lightbox/bulbs	> /obj/item/weapon/storage/box/lights/bulbs
/obj/item/weapon/plantbag		> /obj/item/weapon/storage/bag/plants
/obj/item/weapon/storage/satchel	> /obj/item/weapon/storage/bag/ore
/obj/item/weapon/trashbag		> /obj/item/weapon/storage/bag/trash

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5494 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-08 19:11:56 +00:00
Kortgstation@gmail.com
6ae1348790 Fixed the slime core runtimes.
Made the summon extract NPCs all have the same faction so they will attack players, not eachother.

Gave victims of the advanced mutation toxin universal_speak

Fixed adamantine golem sprites

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5492 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-08 00:03:13 +00:00
Kortgstation@gmail.com
0983ee8912 Added four new slime types (sprites by Reisyn, SuperElement, and LePinkyFace)
Fixed the backwards pumps in misc research, shuffled the xenobio surgical area around to be easier to use.

Fixed being able to strip items with canremove = 0

Added a new mutantrace that ties into the new slime extracts (sprites by SuperElement)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5490 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-07 21:22:44 +00:00
Cael_Aislinn
aae42d928a Merge branch 'incremental_tg' r5200 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/__HELPERS/global_lists.dm
	code/__HELPERS/type2type.dm
	code/__HELPERS/unsorted.dm
	code/datums/datumvars.dm
	code/datums/disease.dm
	code/datums/organs/organ_external.dm
	code/datums/supplypacks.dm
	code/defines/obj.dm
	code/game/area/areas.dm
	code/game/atoms.dm
	code/game/gamemodes/cult/cult_structures.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/gameticker.dm
	code/game/hud.dm
	code/game/jobs/access.dm
	code/game/jobs/job/civilian.dm
	code/game/machinery/alarm.dm
	code/game/machinery/cloning.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/medical.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/objects/effects/decals/contraband.dm
	code/game/objects/effects/signs.dm
	code/game/objects/items/devices/PDA/PDA.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/game/objects/items/weapons/photography.dm
	code/game/objects/structures/door_assembly.dm
	code/game/objects/structures/window.dm
	code/game/sound.dm
	code/game/verbs/ooc.dm
	code/global.dm
	code/modules/DetectiveWork/detective_work.dm
	code/modules/DetectiveWork/evidence.dm
	code/modules/DetectiveWork/footprints_and_rag.dm
	code/modules/DetectiveWork/scanner.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminhelp.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/awaymissions/gateway.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/client/preferences.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/mint.dm
	code/modules/mining/ores_coins.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/living/carbon/alien/alien.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/say.dm
	code/modules/mob/mob.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_transformation_simple.dm
	code/modules/mob/new_player/login.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/mob/new_player/savefile.dm
	code/modules/mob/new_player/sprite_accessories.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/photocopier.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/setup.dm
	code/unused/mining/datum_processing_recipe.dm
	code/unused/powerarmor/powerarmor.dm
	code/world.dm
	html/changelog.html
	icons/effects/96x96.dmi
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/hydroponics.dmi
	icons/obj/items.dmi
	icons/turf/areas.dmi
	icons/turf/walls.dmi
	maps/RandomZLevels/fileList.txt
	maps/RandomZLevels/spacebattle.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-07 00:23:22 +10:00
Kortgstation@gmail.com
bc56419710 Fix for slime steroids not working.
Fix for slime monkey spawning only spawning one monkey (it spawns 3 now).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5476 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-06 01:27:58 +00:00
Kortgstation@gmail.com
49b6e1c64f Added three new slime reactions.
Made slimes emote less often.

Found a better way to fix the runtimes I'd been getting, most cores delete on being used again.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5474 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-05 18:20:10 +00:00
Kortgstation@gmail.com
14643c9517 Fixed slime extract related runtimes. Apparently it didn't like having them get deleted as part of the chem reaction.
To make it easier to deal with all the extracts that are gonna be laying about, made it so using a slime extract changes the name to "used slime extract" (this means you can store used ones neatly and separately within the slime fridge).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5473 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-05 14:31:21 +00:00
rockdtben@gmail.com
169c96db1b Too remove potential excessive garbage collection per tick. We will be reusing lists for overlays instead of deleting and creating them.
the .Cut() proc on a list will empty a list by default. This also will set the len to 0.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5465 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-04 15:11:06 +00:00
Kortgstation@gmail.com
51613ccbb6 Made it slightly easier to get Tier 4 slimes.
Gave additional reactions to grey and purple cores (using blood and sugar, respectively).



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5464 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-04 07:01:00 +00:00
aranclanos@hotmail.com
808455cbbe Runtime fix for syringe projectiles trying to hit all the mobs on the same turf.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5459 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-03 17:07:46 +00:00
Kortgstation@gmail.com
aa92ab7df9 Added 13 types of slimes/changed slime reproduction to give mutation chances on birth.
Added 13 core types with a mix of old and new reactions. Each slime has its own core type/reaction.

Added plasma sheets/a grinder to xenobio.

Added Phoal's slime people sprites.

Added simple animal pet slimes (one of the core types allows you to obtain them).

Updated the changelog

Still to come: slime types having their own temperature resists/special attacks.

This is all probably unbalanced as well but we'll see how it goes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5454 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-03 02:51:52 +00:00
Chinsky
73cdecd81d Replaced codersprite for bloodpack with new ones.
Also now sprite changes depending on how filed bag is.
2013-01-03 03:40:36 +04:00
giacomand@gmail.com
6d63d6d4e0 -Got the disease types switched around. I switched them back. Fixes Issue 1213
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5419 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-29 12:35:56 +00:00
Cael_Aislinn
c0102cf13e Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/defines/procs/global_lists.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/mecha/working/ripley.dm
	code/modules/mob/living/carbon/human/human_attackalien.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/new_player/preferences.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-29 13:06:03 +10:00
Cael_Aislinn
31349fb7d3 Merge branch 'incremental_tg' r5067 into bs12_with_tgport
removed extraneous admin attack messages, temporarily disabled much moderator stuff (will be re-enabled in future updates)

Conflicts:
	baystation12.dme
	code/__HELPERS/type2type.dm
	code/controllers/configuration.dm
	code/datums/datumvars.dm
	code/datums/helper_datums/getrev.dm
	code/defines/obj.dm
	code/game/gamemodes/events/black_hole.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job_controller.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/machinery/turrets.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/turfs/turf.dm
	code/game/verbs/ooc.dm
	code/global.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/admin.dm
	code/modules/admin/admin_memo.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/holder2.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/admin/verbs/diagnostics.dm
	code/modules/assembly/igniter.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/jobs.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/preferences.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/photocopier.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/setup.dm
	code/stylesheet.dm
	code/world.dm
	config/admins.txt
	config/config.txt
	html/changelog.html
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
	icons/turf/areas.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-28 14:13:11 +10:00
Cael_Aislinn
e6c70937e5 Merge branch 'incremental_tg' r4967 (27/10/2012) into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/__HELPERS/game.dm
	code/__HELPERS/type2type.dm
	code/datums/helper_datums/getrev.dm
	code/game/atoms.dm
	code/game/gamemodes/events.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/machinery/telecomms/telemonitor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/objs.dm
	code/modules/DetectiveWork/detective_work.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/admin.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mint.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/mob.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/photocopier.dm
	code/modules/power/gravitygenerator.dm
	html/changelog.html
	icons/mob/head.dmi
	icons/mob/human_face.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/suits.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-28 01:07:36 +10:00
giacomand@gmail.com
3e24586d6b -Work done on facehuggers to stop them from being buggy if they're sterile or in a bag. Added icon sprites for inactive facehuggers when they're on a person, meaning they won't turn invisible.
Fixes Issue 1052
Fixes Issue 1065

-Added a world limit for blueprints naming areas.
-Fixed a wrongfully named research design.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5394 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-24 19:56:20 +00:00
cib
53e500188b Fixes to the IV drip. 2012-12-24 19:09:45 +01:00
giacomand@gmail.com
cdc4332769 -Should fix machines not depowering correctly. Let me know if you find a machine which should be powered off but isn't.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5388 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-24 00:12:12 +00:00
cib
c354685bd7 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature 2012-12-22 17:56:02 +01:00
Hawk-v3
70b40dfc6b Merge pull request #2096 from comma/crates
Crates
2012-12-22 08:29:21 -08:00
cib
767e9f33cf Reduced chemical metabolism and effect of chemicals.
Most chemicals should now act just as strongly as before, but much more slowly.
2012-12-22 02:51:40 +01:00
Chinsky
581f2c4db5 Merge branch 'master' into crates 2012-12-21 01:03:20 +04:00
ericgfwong@hotmail.com
4ca1f32713 Increased the probability of tricord's effectiveness from 40% to 80%
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5356 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-18 21:05:20 +00:00
cib
d0735e9a87 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature
Conflicts:
	code/ZAS/ZAS_Zones.dm
	code/game/gamemodes/events.dm
2012-12-16 15:10:04 +01:00
d_h2005@yahoo.com
67bab3b87f Small bugfix for extract reactions.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5340 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-16 04:17:54 +00:00
d_h2005@yahoo.com
5b10f935a3 Adds a blocked list to slime extract critter reactions, currently stocked with the "human" simple_animals - as that causes roleplay problems especially regarding the AI - and the station-eating large xeno queen boss.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5339 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-16 03:54:10 +00:00
d_h2005@yahoo.com
7e007d5730 Fixes the runtime errors that made chaos donuts inedible
(commit of the year right here folks)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5318 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-14 03:58:36 +00:00
ericgfwong@hotmail.com
2d54b4c870 Robotics is now a full Science department.
Completely remapped Research Division, Robotics, Medbay, and the Library.
Partially remapped Cargo Bay, Mining Dock, Engineering, and Atmospherics.

APC access renamed to Power Equipment. Assigned to SMES room door and PA shutter controls.
Delivery Office access renamed to Cargo Office and given to miners.
CE loses robotics access.
Roboticists and geneticists get Science corridor access
HoS and HoP get construction access (Engineering/Atmos lobby) and cargo office access (cargo lobby)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5304 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-13 05:51:56 +00:00
petethegoat@gmail.com
dde9d121a2 Fixes issue 1154. Slime Jam Not Appearing
Nerfed the janicart ricochet chance a bit.

Removed the coolness check from the det revolver.
Removed the det revolver from the map, and made it spawn in his locker.
You can now modify the det revolver to fire .357 with a screwdriver.
Fixed the det revolver having one round too many. S&W Model 10 only has six shots.

Updated some guncode, mostly just adding proper text styles.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5297 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-11 22:01:25 +00:00
cib
96fb7cf14b Rebalanced spaceacillin metabolism.
It used to be something like 1 unit per tick, which only lasted around 2
minutes for 15 units. Now it'll last a bit longer, making it actually
useful.
2012-12-11 13:22:44 +01:00
Cael_Aislinn
21c9f55654 Merge remote-tracking branch 'remotes/Baystation12/Baystation12/master' into work_in_progress 2012-12-11 12:38:58 +10:00
Mloc
9d60a87ee4 Merge pull request #2020 from GauHelldragon/master
Service Borg Upgrade
2012-12-10 08:44:33 -08:00
giacomand@gmail.com
33c191f685 -Hyprospray will now log the reagents it is injecting. Fixes Issue 1132.
-Made the photos appear bigger on the newscaster.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5280 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-07 23:36:08 +00:00
giacomand@gmail.com
05ea5c67bf -Added a virus food dispenser for the Virologist. You'll find it in Virology.
-Added a sprite for the food dispenser (WARNING: it's a re-colouring of the pepperspray dispenser)
-Changed the reset button's position so it's on the bottom, this way people won't accidentally click it.
-Slightly increased the height of the job selection window.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5278 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-07 20:23:28 +00:00
giacomand@gmail.com
69fcf61ed3 Committed Rolan7's patch to add more convenience to Hydroponics. The feature list includes:
* Makes grass auto-stack when harvested
* Allows seeds to be extracted from grass
* Allows the smart-fridge and plant bags to accept seeds.
* Lays the groundwork for a seeds-only version of the smart fridge, to eventually replace the existing seed vender (not yet hackable, though)

-Fixed window doors not opening when you click on them.
-Added a reset button for the job selection screen.
-Fixed a bug with the traitor panel which leaves ex-changelings with the evolution menu.
-I re-added the variables for the intercept report but commented them out.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5276 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-07 13:27:33 +00:00
giacomand@gmail.com
76151212c7 Committing Malkevin's fix for syndie cakes not having doctor delight in them.
I added a warning log message when a non-existing reagent is trying to be added, to avoid this in the future.

Committing SuperSayu's fix for conveyor belts moving items that were just taken off the belt.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5269 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-06 12:21:46 +00:00
Cael_Aislinn
7e3f58cea2 CPR optimisations, made hypospray visible on the map
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-01 18:06:19 +10:00
Chinsky
2e2c1e8c4c Merge branch 'master' into crates 2012-12-01 07:14:31 +04:00
giacomand@gmail.com
cd2fcfc920 -Fixed blood vomiting not hurting you.
-Removed an unneeded fingerprint proc.
-Fixed some of the blood/vomit/gibs spills not correctly processing.
-Reduced the life of a virus with no mob host.
-You can now tell how a virus spreads by the Pandemic.
-Made making vaccines quicker and making blood virals quicker too.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5232 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-30 16:37:35 +00:00