Commit Graph

1688 Commits

Author SHA1 Message Date
Cael_Aislinn
12d4aed285 added anomaly /area icon_state, fixed anomaly research outpost and shuttle, added cycling airlocks to engineering singularity access (slight reshuffle of engineering areas)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-11-04 16:42:32 +10:00
Cael_Aislinn
739e965b5f Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport, removed unnecessary includes fron the .dme
Conflicts:
	baystation12.dme

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-11-03 12:21:54 +10: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
96813cac8e another partial fix
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-25 21:30:26 +10:00
Cael_Aislinn
b35fc75a33 partial antiqua compile fix
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-25 21:23:40 +10:00
Ravensdale
ca12f83a9c Fix to: AI core wiring to prevent power sinks from draining AI APC's. visible pipe manifest visible in research. Minor wiring tweak to SW solar array. 2012-10-23 13:53:53 -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
Cael_Aislinn
0961489327 wired AI smes into the main grid, fixed wiring + piping + camera issues in anom lab
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-22 20:05:05 +10:00
giacomand@gmail.com
6f7c26629d -Changed xeno to have a safe way to hatch eggs with plasma.
http://imgur.com/80LJx

-Added a turf meter which shows the air contents of a tile.
-Added a simple vent controller for the dual vents.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4935 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-22 05:41:00 +00: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
fbf3396e4c map compile fixes, added a surprise to the teleporter
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-21 02:51:30 +10:00
Cael_Aislinn
0f3f008ff6 mergefixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-21 02:22:06 +10:00
Cael_Aislinn
01d3e3bf79 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Conflicts:
	code/datums/disease.dm
	code/modules/reagents/Chemistry-Reagents.dm
	icons/turf/areas.dmi
	maps/tgstation.2.0.9.1.dmm

yep, this time going to merge map updates before making map changes >.>

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-21 01:25:04 +10:00
Cael_Aislinn
e1ac37ee90 tg map updates
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-21 01:12:40 +10: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
giacomand@gmail.com
601e1068e7 -Added welding goggles to the assembly line and misc. science.
-Assembly line now has 2 flashes and 8 synthetic flashes, to create Cyborgs with.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4913 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-19 17:27:22 +00: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
cib
fafe46e197 Added internal wound surgery. 2012-10-18 13:32:45 +02:00
cib
d90944ad50 Several medical related changes.
- There's now internal wounds
- Appendicitis stage 4 causes internal wounds
- Added back the body scanner
2012-10-18 12:39:04 +02: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
zartco
6da1e841a1 Remodels Engineering Break Room, spreads suits out over engineering and adds magboots, adds an airlock separating engineering storage from the engine room. 2012-10-17 22:06:55 -05: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
aranclanos@hotmail.com
7091d99a69 -Fixes issue 1002
-Moved the objects around in the research room in RnD. Now EVERYONE will know that there's a large beaker there.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4905 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-17 15:33:28 +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
headswe
f296f9c3c8 Merge pull request #1761 from caelaislinn/bs12_with_tgport
misc merge things
2012-10-15 10:59:58 -07:00
cib
150d7e51b5 Added some medical stuff to the map.
Also added blood packs.
2012-10-15 19:17:38 +02: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
Ravensdale
ce62410058 Added a vent and scrubber to cargo 2012-10-14 14:30:03 -07:00
giacomand@gmail.com
e404e7774e -Replaced two manual valves in atmos (above the canister ports) with easier to use pumps. This will let you easily redirect the flow of the gas.
-Busses can now be connected to broadcasters.

Meaning a simple setup of:

Receiver -> Bus -> Processor -> Bus (same bus) -> Broadcaster.

Not as fast as the current setup, but it would be nifty for emergencies.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4875 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 11:03:07 +00: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
baloh.matevz
e914038494 - Added objects to engineering in 3.0.0
Screenshots:
http://www.kamletos.si/engineering%20for%203.0.0%20alpha.png
http://www.kamletos.si/engineering%20for%203.0.0%20alpha2.png (No darkness)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4856 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-13 18:40:47 +00:00
Cael_Aislinn
ca662dc43f removed unnecessary backup
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-14 03:40:58 +10:00
baloh.matevz
92650f1464 - Committing additional work done to security in the 3.0.0 map.
Screenshots:
http://www.kamletos.si/security%203.0.0%20alpha3.png
http://www.kamletos.si/security%203.0.0%20alpha4.png (no darkness)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4854 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-13 13:45:59 +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
cib
5ef6399238 Fixed a ton of the issues in http://piratepad.net/9CwFobI4lZ 2012-10-12 13:58:18 -07: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
baloh.matevz@gmail.com
bd4cfcf893 - Placed objects in the security wing of 3.0.0
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4843 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-10 21:11:34 +00:00
Cael_Aislinn
58582738af ano lab mapfix
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-10 01:16:49 +10:00
Cael_Aislinn
6365459bde additional mergefixes, including tg map updates
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-09 23:22:51 +10:00
Cael_Aislinn
cccff0881f Merge remote-tracking branch 'remotes/git-svn' tgstation r4838 into bs12_with_tgport
Conflicts:
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/structures/watercloset.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/new_player/new_player.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-09 23:07:41 +10:00
Cael_Aislinn
e39cd81342 tg map updates
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-09 22:50:02 +10:00
giacomand@gmail.com
9cf619410f -Commited Skasi's atmospheric changes. See here: http://nanotrasen.com/phpBB3/viewtopic.php?f=9&t=9953
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4830 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-08 01:31:33 +00:00
sieve32@gmail.com
396fb3b411 Commiting for Aranclanos
-Fix for blindfolds not protecting from flashes
Fixes Issue 934
-Being handcuffed drops held items
Fixes Issue 975
-Can no longer abuse the holodeck to deconvert revs
Fixes Issue 968

Tested everything myself and it all works

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4829 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-07 22:18:29 +00:00
baloh.matevz
2bf2f7bef8 - Updated ingame polling to allow for polls that ask for player-entered text. This allows for more complex answers than a pick from a list.
- Added simple bump teleporters.
- Updated 3.0.0 some more, including the draft of a new Centcom.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4826 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-07 21:08:23 +00:00