Commit Graph

123 Commits

Author SHA1 Message Date
Cael_Aislinn
42d8cd33e0 made fuel injectors and core gens properly start in mobile configs, made large crates able to hold 1 large item (machinery or structure)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-16 20:58:31 +10:00
Cael_Aislinn
06476113fa add the beekeeping manual to hydroponics, add a beenet to the hydro lockers
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-09 23:48:31 +10:00
Cael_Aislinn
ae2b667f38 fixed icon issues with large crates, added a reinforced large secure crate (different aesthetically)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-06 21:18:15 +10:00
Cael_Aislinn
efd586a9e1 added large metal crates (secure and normal variants) to be resprites of normal crates
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-06 01:32:28 +10:00
Cael_Aislinn
bb5a349fcf Merge branch 'incremental_tg' r5600 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/__HELPERS/global_lists.dm
	code/controllers/master_controller.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/hud.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/machinery/computer/cloning.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/implants/implantnanoaug.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/turfs/turf.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/shoes/miscellaneous.dm
	code/modules/clothing/under/ties.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/silicon/say.dm
	code/modules/mob/mob_defines.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/modules/projectiles/projectile.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/setup.dm
	config/config.txt
	html/changelog.html
	icons/effects/effects.dmi
	icons/mob/feet.dmi
	icons/mob/head.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/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	maps/tgstation.2.1.0.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-23 00:23:37 +10:00
ericgfwong@hotmail.com
4d9af5c0a4 Recolored a bunch of objects to make medbay's department colours more clear and consistent. The colours are green/white.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5593 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-21 00:11:48 +00:00
giacomand@gmail.com
95392cae87 - Fixed retaliating simple animals acting weird and added some minor improvements. They should act better to mechs.
- Decreased the amount of possible chickens you can get from the crate.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5577 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-18 19:54:00 +00:00
Cael_Aislinn
8581932c57 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/game/objects/items/toys.dm
	icons/mob/back.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/uniforms.dmi
	icons/obj/weapons.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-14 22:14:46 +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
ericgfwong@hotmail.com
b6762f4382 Added map 2.1.1, which runs department security.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5544 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-14 00:50:14 +00:00
Chinsky
08160b5111 Added alternative security uniforms to wardrobes.
Security armor vest now has different sprite.
2013-01-12 22:48:18 +04:00
giacomand@gmail.com
a56e922053 Committing for Cael_Aislinn:
= Giant Spiders =
- Nurses spin webs which impede progress, bundle items and mobs up in cocoons, lay eggs to create spiderlings
- Nurses are slow and weak, but their bite has a chance to paralyse the victim
- Spiderlings skitter about and eventually grow into giant spiders. 
- Spiderlings will ventcrawl, so they can spread over the station pretty fast. 
- Hunters are fast, have decent health and the most effective poison
- Guards are medium speed but the health and direct damage
- The poison of hunters and guards can cause hallucinations if they bite you

= Farm animals =
- Cows can be milked or butchered for a large supply of meat. Sadists can also tip them over (with intent_help). 
- Goats can also be milked, but have a nasty temperament. 
- Chicks grow up to be chickens, who lay eggs and continue the cycle. But where did it start? (they're very noisy). 
- All three are orderable via QM. 

My changes:

- Added a spider infestation event.
- Optimized code with spiders and simple_animals.
- Made a /hostile/retaliate type which will only fight back when hurt. Based on Cael's code.
- Added some farm animals on the map.
- Changed events, added a setup() proc which can let you setup variables or the event. Made the event only kill itself when it has called, announce(), start() and end().
- Brainrot will only need alkysine as a cure.
- Communication blackout will always be silent.
- Changed some admin buttons to use the new event system.
- Added a forceEvent proc which you can use when you enable debug verbs.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5525 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-12 16:44:06 +00: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
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
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
Hawk-v3
d1fbc74a11 Merge pull request #2145 from GauHelldragon/bleeding
Seedbags!
2013-01-05 15:56:34 -08:00
Zuhayr
6751c1a6be Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-01-06 03:12:48 -08: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
Chinsky
24a02f90b9 Ported coats pockets 2013-01-04 05:31:14 +04:00
GauHelldragon
17317e3ff6 Fixes closets and destructive analyzer
You can no longer load your robot modules into these. Fixes #2138
2013-01-03 16:08:46 -08:00
Chinsky
5e24bc8f34 Added surgery caps. 2013-01-03 02:46:15 +04:00
GauHelldragon
b1dd8f50f3 Seedbags!
Added seedbags to hydroponic lockers and the nutri-vendor
They function similarly to plantbags, but obviously hold seeds. The interface for taking seeds out is identical to the smartfridge, however.
2013-01-02 02:54:48 -08:00
ericgfwong@hotmail.com
468a106278 Science lockers spawn with their striped labcoat now.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5445 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-02 01:22:52 +00:00
ericgfwong@hotmail.com
70dcb95ddd Reorganized the Command Sector. The Captain has his own private quarters in addition to his office.
https://dl.dropbox.com/u/831776/bridge_swap11.png

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5426 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-30 23:41:45 +00: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
d_h2005@yahoo.com
12e8a32eb2 Tiny adjustment for Ikarrus: The alternate HoS jumpsuit is not a subtype of the normal, and therefore counts towards fulfillment of the Steal objective.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5365 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-21 04:28:11 +00:00
giacomand@gmail.com
eca72b69aa -Added constructable solar arrays.
-Added a solar pack crate to order.
-Machines that have a use_power of 0 will no longer be turned off due to lack of power in the area.
-Fixed a bug with the solar computer not reconnecting to the powernet when dismantled and remantled.
-Increased the cap of crates to 30.
-Some performance tweaks.
-Some standardization.
-All objects of type /obj/machinery/power will try to disconnect from the powernet before deleting, this will help reduce the node list size.
-Added a heat_proof variable for doors. It will effect glass airlocks and it'll determine whether they can block heat or not. Research glass airlocks will always have it enabled.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5344 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-16 19:51:23 +00:00
ericgfwong@hotmail.com
41e3f7bf64 -Added fire extinguishers to xeno and viro
-Added lights to singularity containment
-Engineering lockers now use Power Equipment access
-Expanded Tox Storage access to include the Tox lab, making it a separate access like Xenobiology

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5343 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-16 19:10:45 +00:00
ericgfwong@hotmail.com
3198faf3d9 Merged Atmos Refilling and Monitoring rooms: https://dl.dropbox.com/u/831776/refill4.png
Added blast doors over CE office
Added Atmos lockdown button to CE office
Moved Hypospray into CMO's locker

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5323 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-15 04:11:58 +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
johnsonmt88@gmail.com
71a874e782 You can no longer steal chairs that mobs are buckled to those chairs. Fixes issue 1133.
False walls now have a variable that flips on when it's opening or closing. This should prevent the closing door code to execute after trying to open the door (or visa versa) due to the sleep()s used in there.

I've also re-organized teh  false_walls.dm file a bit. False r-walls really need to be changed into a subtype of false walls at some point.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5289 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-08 22:36:49 +00:00
ericgfwong@hotmail.com
f7abe34c72 Removed mining department radio frequency. Miners and Cargo techs will all be under the Cargo radio instead.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5265 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-05 23:27:10 +00:00
johnsonmt88@gmail.com
35cb1b2530 Removed storage.dm from defines and moved the storage item defines to the location of their respective procs.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5252 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-02 19:00:33 +00:00
aranclanos@hotmail.com
4f010d9730 Fixes issue 1138 - Stashing lockers on crates.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5248 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-02 08:01:12 +00:00
Cael_Aislinn
2f7baa26f8 antiqua fixes: tvalve, barsigns, doctor's wardrobe, high volume pump, engine areas, moving parts sign, various other areas
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-01 17:49:34 +10:00
ericgfwong@hotmail.com
e550f54ad3 Readded gloves to the lockers in atmos, mining, cargo, and robotics.
Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5240 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-01 01:42:10 +00:00
ericgfwong@hotmail.com
4dab53f771 Replaced janitor's latex gloves with black ones
Removed ALL gloves from Robotics, Atmos, Mining, and Cargo
Updated my journal

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5239 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-01 01:21:17 +00:00
ericgfwong@hotmail.com
136800a071 Swapped the locations of the Vault and Tech Storage.
Cargo Techs, Miners, and Roboticists no longer start with gloves. Instead, a limited number of gloves have been added to each of their departments.

Shuttle Brig now requires Holding Cell access
Janitor given a pair of latex gloves
Red pen added to Warden's office by request


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5238 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-01 01:03:15 +00:00
d_h2005@yahoo.com
ffe7bc7a90 -Adds scythes
-Adds weed control crates, orderable by cargo techs, for the purpose of kudzu control.
-You can now construct folders with cardboard sheets.
-Moves newspaper sprites out of weapons.dmi

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5206 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-27 02:20:20 +00:00
giacomand@gmail.com
f1d24f27f9 Simplified Detective.
-Changed the focus from the high-res scanner to the regular scanner. It will simply scan the fingerprints and display them to the detective. For extra functionality, it'll store it's findings in a log and then you can print it out in a report by using attack_self().

-Detectives can now use the medical computer.
-Removed the pda forensic scanning functionality.
-Got rid of now useless high-res scanner computer. Got rid of the now useless fingerprint cards.
-Added a medical computer to the detective's office and replaced the useless medical cabinet with an empty one.

Other

-Got rid of diseases magically moving down a stage.
-Optimized playsound()
-Added an attack_self() to sprayers so that you can change the reagent use of them between 5 and 10.




git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5168 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-23 00:39:18 +00:00
petethegoat@gmail.com
6db2d55bbd Improved rigged crate code for some anon on /vg/
Made syringe guns do no damage on behalf of coderbus.

Added some new book sprites and updated some books.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5134 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-20 16:06:14 +00:00
petethegoat@gmail.com
d8c0a0e437 Added crate traps for Cheri.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5103 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-18 00:24:31 +00:00
Ravensdale
19bca3e2ef Update code/game/objects/structures/crates_lockers/closets/utility_closets.dm 2012-11-01 15:43:09 -07:00
Ravensdale
ce7e72c367 Fixes what emergency lockers spawn with so masks aren't rarer than diamonds. 2012-10-29 17:11:54 -07:00
petethegoat@gmail.com
6af0e6ab84 Committing Lisa. God help me if this causes any corgi erp.
Also adding comfy chairs and office chairs to the metal recipes list.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4970 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 18:33:36 +00:00
Chinsky
236780d8c6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-25 03:42:20 +04:00
Chinsky
9d34691b82 Added holsters and bunny slippers.
Holsters work a bit different from before.
They utilize system for clipping things on uniform.
So now holster can be worn on any clothing.
Also it can now hold any handgun(or what I assumed to be handgun).
2012-10-25 02:00:48 +04:00
headswe
0d98248b6f Merge pull request #1821 from comma/master
Pain & Other Ported Things
2012-10-23 08:47:30 -07:00
Cael_Aislinn
dd538fd3c5 Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport
Conflicts:
	code/game/gamemodes/events.dm
	code/game/gamemodes/wizard/veilrender.dm
	code/game/jobs/job/captain.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/life.dm
	code/setup.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-22 20:15:05 +10:00