Commit Graph

66 Commits

Author SHA1 Message Date
Cael_Aislinn
7efc1aafef Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Conflicts:
	icons/turf/areas.dmi
	maps/RandomZLevels/stationCollision.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-07 22:26:24 +10: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
Chinsky
a296018ed1 Got rid of evac part lights. No fun allowed.
Also forgot to change paths for lab coats in away missions, fixed that now.
2013-01-06 12:09:23 +04:00
Chinsky
3ced7fbbd1 Fixed paths in away mission maps 2013-01-04 03:27:13 +04:00
Cael_Aislinn
5768d6a741 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Conflicts:
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-31 02:01:37 +10:00
SueTheCake
1f630254da Actually added my map to the selection file. 2012-12-29 14:09:27 -06:00
SueTheCake
f7249bd519 Added my completed away mission, along with the necessary sprites and code. A Soghun-Compatible RIG suit has also been added. 2012-12-29 01:59:19 -06: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
petethegoat@gmail.com
c69f0cab36 Removed /obj/effect/deskclutter at last.
Updated all maps. (and updated stationCollision.dmm to have new hivebots, cmon kor)

Removed the action button from the flare, as you only ever turn it on once.
Removed a bunch of unused sprites in items.dmi.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5190 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 19:58:28 +00:00
petethegoat@gmail.com
fd9f6490f1 Updated listeningpost.dmm to look nicer and be a bit more interesting.
Updated the Stechtkov pistol. Should be pretty solid now.
Made a returning ex_act for snow floors.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5182 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-24 17:38:24 +00:00
Kortgstation@gmail.com
04b8d36ca7 Ported syndicates over to hostile simple animals.
Replaced the old syndicates in the new ones in all the away missions.

Removed a now unused "issyndicate" proc.

Ported the obstacle smashing over to hostile animals. This means carp will attempt to break into escape and stuff now. Scary! (I can make this syndicate only again if it becomes a problem)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5177 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-24 14:17:42 +00:00
Kortgstation@gmail.com
073737a773 Listening Post, a new away mission, is done. Thanks for the help Giacom.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5172 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-23 04:38:09 +00:00
Kortgstation@gmail.com
67ee202a2e Fixed everyone seeing in the dark.
Committing my almost finished away mission listeningpost.dmm so Giacom can look/help me with the telecomms.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5171 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-23 04:09:32 +00:00
Kortgstation@gmail.com
ad4317fa36 Put in a bunch of missing windows on the space battle map.
Replaced a ton of platings/floors that were bordering space with airless versions in space battle, blackmarketpackers, and stationCollision

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5170 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-23 01:09:54 +00:00
Kortgstation@gmail.com
c02361276e Re-added a buncha Faithless Brotemis took out, final room became pretty damn easy without them.
Lowered the damage shadow people take from 2 brute a tick to 1 brute a tick (so they don't have to spend forever in the dark waiting for the light damage to go away).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5165 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-22 15:32:05 +00:00
Kortgstation@gmail.com
bae59832d6 Fixed challenge.dmm having a centerstation gate piece instead of a centeraway gate piece.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5163 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-22 10:45:21 +00:00
Kortgstation@gmail.com
042fb8a8b6 Accidentally left files out of the last commit.
Accidentally changed emitter projectile damage to 30 last commmit as well (I'd been testing making Ikarrus's map harder). I dunno if it should be switched back or what, it won't really make a difference in normal gameplay.

Committing Ikarrus's new map.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5161 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-22 08:18:50 +00:00
Kortgstation@gmail.com
afe9e93c05 Fixed name of the medical rig
Fixed the exile implant locker.

Made syndicate simple animals slightly squishier (block chance lowered).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5160 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-22 08:15:07 +00:00
giacomand@gmail.com
5f4d0a2de9 -Changed the Resurrection "verb" to a "proc" so that nobody starts with it.
-Fixed a small error with the say() code trying to do a bitflag operation with the preference datum and not the toggle variable in the datum. Added a check for the mob speaking having a client so that ghosts with ears toggled on won't keep hearing mice and other animals talk.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5156 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-21 21:27:12 +00:00
Kortgstation@gmail.com
e9c901a6c6 Shadow mutantrace can see in the dark.
Updated Brotemis's map with his final changes. This involves shuffling about the final room and adding a bunch of diary papers to explain what is going on. He also fixed the meatgrinder.

Personally, I completely overhauled the wildwest wishgranter. You can now actually choose from multiple wishes. Maybe I'll update the basic wishgranter at some point as well to be less terrible.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5153 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-21 18:34:12 +00:00
Kortgstation@gmail.com
8fcff0ac65 Updated the faithless health/damage and the wildwest map to have rig suits on the miner corpses. I'd already edited this locally on the /tg/station servers, so our players shouldn't notice any difference.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5150 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-21 14:25:30 +00:00
Kortgstation@gmail.com
f2c1898b6a Added Exile Implants.
Someone implanted with an Exile Implant will be able to enter the away mission, but unable to return from it. Not only can they be used for getting rid of dangerous criminals, but revs/stationheads count as dead while on the away mission, and traitor/changeling/wizard assassination targets count as dead if they're on the away mission at round end, allowing for those objectives to be completed peacefully.

Added a locker of exile implants to the gateway room.

Added a health analyzer to virology.

Replaced the teleport scroll in station collision with a cultist space suit/helmet. This is both because a teleport scroll is sorta overpowered in general and because it would allow people to easily return from exile.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5133 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-20 14:34:29 +00:00
Kortgstation@gmail.com
7b048f5604 Fixed the NT cruiser areas.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5131 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-20 08:12:47 +00:00
Kortgstation@gmail.com
3c0bc9098c --Wildwest.dmm
-Removed the rorojelly donuts, that was just cruel and unfair
-Fixed the sandstone walls
-Removed the meatgrinder until it can be fixed

--stationCollision.dmm
-Replaced the wood floors/carpets with the new floor types
-Replaced the armoury lockers with empty ones and put suits in a couple. Having 5 full syndie rigs+jetpacks+eswords and shields was a bit much.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5128 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-20 06:25:42 +00:00
petethegoat@gmail.com
3847c3d638 Photocopiers work properly with photos once again.
Updated gateways a bit, they use a few less globals now.

Added some new snow icons.
Added a wip away mission.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5122 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-19 16:28:52 +00:00
johnsonmt88@gmail.com
7dad5e0af2 Moved shuttle_engines.dm to the unused folder as it has apparently been unticked for ages.
Moved the modified wish granter and meat grinder from Brotemis' away mission map (wildwest) into wildwest.dm in the random z-level folder. This way if we get to rotating through different maps, we wont have leftover unused code laying around.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5118 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-19 01:00:32 +00:00
petethegoat@gmail.com
b67262b32b Ported over BS12 style cameras, which photograph a 3x3 area. It's fuckin radical.
Removed /obj/item/weapon/camera while I was at it (unused).
New cameras are in modules/paperwork/photography.dm.
Standardised folder and paper naming a leetle bit.

Added a new gamekit sprite, also from BS12.

Path changes!
/obj/item/weapon/camera_test > /obj/item/device/camera

Updated all maps with the path changes, excepting oldstation.dmm.

Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5116 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-18 23:41:37 +00:00
petethegoat@gmail.com
8594527d2d Updated signs.
Fixes issue 1015. Layering issue, false wall, station map

Path changes!
/obj/effect/sign > /obj/structure/sign
/obj/effect/decal/poster > /obj/structure/sign/poster
/obj/effect/sign/maltesefalcon1 > /obj/structure/sign/maltesefalcon/left
/obj/effect/sign/maltesefalcon2 > /obj/structure/sign/maltesefalcon/right

Updated all maps (except oldstation.dmm) with the new paths.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5111 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-18 18:43:41 +00:00
Kortgstation@gmail.com
121e8fa1d9 Split corpses into corpse and mobcorpse. Corpse is still used for decorating maps, mobcorpse is used for simple animals dropping human bodies.
Committing Brotemis's updates to his Wild West map/fixes he had for the associated code.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5093 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-17 01:43:13 +00:00
Kortgstation@gmail.com
63f7a3ab30 Put the sandals in beach.dmm in crates.
Fixed the plasma walls to use the new types in spacebattle.dmm, as well as removed a shitty spawn point and replacing some misnamed crates. Also added some bananium.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5086 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-16 10:32:10 +00:00
Kortgstation@gmail.com
a814ff7be4 Syndicate simple animals will only attempt to destroy obstacles when chasing a target. Now the away missions wont start horribly smashed up.
Committing Brotemis's away mission and related code. I think he wanted to make a few more changes, but it should be functional.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5085 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-16 02:32:38 +00:00
aranclanos@hotmail.com
772eee0fd0 Whoops I forgot a file in the commit.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5055 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-13 13:45:31 +00:00
Cael_Aislinn
e8b44dca13 made away missions actually load properly, also added a command report / admin report when they become active. made all away missions except wizard academy possible destinations
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-27 19:59:05 +10: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
Kortgstation@gmail.com
3a52f9b2b7 Added items to the crates on the space battle map. Added new areas for the various syndicate ships instead of all of them being Nanotrasen Cruiser.
Captain now spawns with an armoured vest on and his spacesuit spawns on the rack with his jetpack/helmet. This means the suit will exist even if a captain doesn't at round start.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4930 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-21 10:31:16 +00:00
Kortgstation@gmail.com
863ce4826a The booze vendor on the beach map starts emagged so you don't need to be a bartender to use it.
Deleted an extra airlock in the spacebattle map, made the kitchen/bathroom nicer

Fixed the lighting in the gateway room on the station map

Gave the melee syndies nopush so you can't just dash through mobs of them forever. They're slightly faster as well (though still slower than a maxspeed human).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4928 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-21 06:01:31 +00:00
Cael_Aislinn
2f853fe23a Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/devices/radio/radio.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/mob/living/say.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/paperwork/paperbin.dm
	html/changelog.html
	icons/turf/areas.dmi
	maps/RandomZLevels/assistantChamber.dmm
	maps/RandomZLevels/fileList.txt

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-21 00:25:05 +10:00
d_h2005@yahoo.com
0e52879814 Away Mission Tweaks:
-Fixed a few doubled-up tiles and such on my black market away mission.
-Fleshes out the academy a bit more: adds some books to the library, changes one of the SMES rooms into a build-your-own telecomm station.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4911 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-19 00:58:56 +00:00
Kortgstation@gmail.com
326c57fa04 Fix for the chef corpse spawning half naked.
Fixed Nodrak's empty c20r spawning so it only happens to the guns on his map.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4907 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-18 03:45:00 +00:00
petethegoat@gmail.com
d8c376188c Moved the tank dispenser define out of defines.
Changed the tank dispenser path from /obj/machinery/dispenser to /obj/structure/dispenser.

Fixed a bedsheet bin bug.

Updated the map and away missions.
Removed assistantChamber.dmm and desert.dmm.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4906 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-17 22:43:58 +00:00
Kortgstation@gmail.com
4bb0e22624 Fixed palm trees. You can no longer shove them around, and you'll no longer appear standing over the top half of them.
Ticked Academy.dm so the Academy map can actually be played.

Removed desert.dmm and assistantChamber.dmm as they were both unfinished/terrible. One was literally just a z level of sand and bears, the other was a tiny room full of turrets. Neither even had gates.

Added a small, simple beach map and a new area for it (with tanning re-added). Just a place for the crew to relax. Nothing dangerous, nothing notable loot wise.

Updated the away mission fileList.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4896 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-17 05:12:39 +00:00
Kortgstation@gmail.com
ac75903c33 New bluespace artillery sprites by Ausops.
Updated the gun/my map to use them.

Fixed an error in the holo-deck logging. "overrided" is not a fucking word.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4888 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-16 02:55:51 +00:00
d_h2005@yahoo.com
d1c4c8bc4e -Committing my second away mission map: It's time to go back to school!
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4886 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-15 21:02:40 +00:00
Cael_Aislinn
548f60d25d Merge remote-tracking branch 'remotes/git-svn' r4881 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/game/gamemodes/events.dm
	code/game/machinery/doors/door.dm
	code/game/machinery/gateway.dm
	code/game/objects/items/devices/flashlight.dm
	code/game/sound.dm
	code/global.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/handlabeler.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paperbin.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/photocopier.dm
	code/modules/paperwork/stamps.dm
	code/world.dm
	html/changelog.html
	maps/RandomZLevels/fileList.txt

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-15 23:17:18 +10:00
d_h2005@yahoo.com
8a39af31ee New version of my away ship. No more aired/airless turf lag. Replaces the normal SMES with infinite SMES.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4871 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 03:16:26 +00:00
petethegoat@gmail.com
65f4910c94 Updated trashbag code a teeny tiny bit. Mostly just changing it to use proper text styles.
Added a world.log message when away missions are loaded.
Fixed a spelling error in stationCollision.dm.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4868 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 02:01:54 +00:00
Kortgstation@gmail.com
e6296952fa Fixed the medkits on my map being empty.
Removed several turrets from the syndicate ships, as they made them impossible to leave/killed the syndicate mobs.

Gave the syndicate mobs slightly more health, as the unshielded ones were dying before they could react.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4867 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 01:54:19 +00:00
Kortgstation@gmail.com
304ac5e6c3 Changed the way corpses get named (cause the old one isn't working). They just take the landmark name as their name.
Tweaked my away mission spawn points/loot/enemy locations, and named all the corpses correctly this time.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4852 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-13 04:06:32 +00:00
Cael_Aislinn
419247adfe Merge remote-tracking branch 'remotes/git-svn' 4847 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/game/verbs/ooc.dm
	code/modules/admin/admin_verbs.dm
	code/modules/food/recipes_microwave.dm
	html/changelog.html

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-12 17:53:17 +10:00
Kortgstation@gmail.com
29fe7720ca Committing my mostly finished away mission.
Added a few new corpse types

Simple animals can now open doors

Added a bluespace artillery control machine. Using PA sprites as placeholders until I get real ones.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4847 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-12 06:05:52 +00:00