Commit Graph

314 Commits

Author SHA1 Message Date
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
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
defcbdc0ac Merge branch 'test_branch' into work_in_progress 2012-12-05 04:48:10 +10:00
Cael_Aislinn
bc3b0757fc added functional bunsen burner (with placeholder sprite), added capability for heated chem recipes, added preservation of data across chemical reactions for xenoarch (not sure if it actually works, seemed a bit buggy), added tungsten as a dispensable reagent for xenoarch
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-05 04:47:48 +10: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
SweeperM
b8a12b0b52 Fixes to lighting
-Fixed #2005 (for sure!)
-Fixed the stacking of brightness. Now the most bright item turned ON will be the one where the user gets its luminosity of.
-Cleaned the code a bit. Now only one var controls the on/off switch of light, and another holds the value of brightness when on.
2012-11-29 23:01:51 +00:00
Kortgstation@gmail.com
0c4f441cb5 Added Cheridan's slime sprites to replace roros. Replaced all mentions of roro/metroid with slime. Once Cheri has the rest of the sprites/Phol gets mutant race sprites I'll start work on redoing metroid/slime code with Giacom and adding breeding.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5223 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-29 04:12:22 +00:00
GauHelldragon
c896fd6fcb Added feedback messages for when service bot auto-refills their drink containers.
Tweaked battery charge usage for refilling, and fixed bug where it would not refill if you empty it completely.
2012-11-27 05:47:43 -08:00
giacomand@gmail.com
7cd6d5eaa4 -Added the previously unobtainable hallucigen disease to the virus crate. Increased the virus crate from 20 to 25.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5194 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 21:56:18 +00:00
giacomand@gmail.com
af523d3e8f Added a new symptom with a high level, so that it's not possible to gain through mutations.
Gave the high level symptoms their own preset diseases and added them to the virus crate, along with a bottle of mutagen.

Several disease fixes, such as disease stages going below 0. Diseases which spread by blood will longer spread when you touch someone (i.e: click on someone)

I also did some cleaning up with comments.

Made handheld radios broadcast if their messages aren't sent on the same level as they're on, meaning that turning off the relay to the station will not make it impossible to communicate with others with radios.

Made some events only effect people on the station Z level.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5192 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 21:32:07 +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
giacomand@gmail.com
a0e8bb51e0 -Increased the amount of units the sprayer used to make water slippery again.
-Added a verb to empty the contents of the sprayer onto the floor.
-Admin spawnable only poisonousness apple added.
-Apples will always be eaten in one bite, to balance it, the apple can only hold 20 reagents now.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5104 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-18 02:13:00 +00:00
giacomand@gmail.com
9894568500 -Cyborg Hypospray will no longer lose it's reagents when switching modes.
-Spaceacillin will now prevent the spread of diseases while it is a mob.
-Moved the "Create A Disease" code into a proc.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5101 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-17 22:28:48 +00:00
d_h2005@yahoo.com
2aadd58680 Removes duplicate watermelon define.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5082 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-16 01:08:34 +00:00
d_h2005@yahoo.com
34905c08d4 Adds kudzu plants, which can be grown in hydroponics trays. They are only obtainable by injecting mutagen into a tray with lots of weeds.
Glowberries have uranium inside them now instead of radium, which caused overlap since glowshrooms also had radium.
Also tweaked cocoa pod sprites a little bit.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5081 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-15 23:56:28 +00:00
giacomand@gmail.com
78887723ca -New corridor airlocks! They will replace the regular glass airlocks in the corridor but they have an extra feature. They stay open by default and close/open automatically based on the local area's air alarm alert.
-Got rid of a magic number in implants.
-Robots cannot hide their items in food anymore.
-Updated changelog with disease naming.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5077 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-15 16:40:54 +00:00
Chinsky
3f0eb4836f Ported some crate types frpm pre-merge.
Moved posters to arts crate and lipstick with cigs to party crate.
Contraband crate now has killer tomato seeds, illegal booze and drugs.
2012-11-15 17:17:56 +04:00
Cael_Aislinn
addb95137c made autoinjectors visible again, fixed medibot construction, fixed tajaran ears while lying down
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-11-15 21:02:04 +10:00
giacomand@gmail.com
67906a03a0 -You can now name your advance diseases. You can only name unnamed diseases.
-Removed the mutagen requirement from a metroid recipe so it does not conflict with the mix_virus recipe.
-When deaf, you'll get a notice when you see someone talking but you don't hear them. Being blind and deaf will give you no message, because you won't be able to tell. Talking while deaf will give you a message, even while blind.
-Diseases can't be cured by having a high body temperature now.
-I cut down the copy+paste on the meter code.
-Advance diseases now have a limit of 3 in a single mob, increased the amount of symptoms you can have to compensate.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5069 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-15 02:30:29 +00:00
giacomand@gmail.com
7955d348d8 Lots of bugs fixed for advance diseases.
Fixed advance diseases using the same reference in mobs.
Fixed advance diseases referencing other advance diseases' symptoms, instead of just copying it.

I tested it more thoroughly this time and I can't find any issues but if you do please add them to the bug tracker and or contact me on #coderbus.

Added a new reaction which will remove symptoms from a disease. Needs blood and synaptizine.
Added a new symptom, shivering will make you cold.

Tweaked and balanced some symptoms.

Removed the "flex" emote that hulks will do randomly.
Reduced the change to speak for hulks and brain damaged mobs. ( 7% -> 3% chance)

Please let me know if anything is out of place or wrong.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5048 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-13 00:28:07 +00:00
cib
2522d5e7f1 Fixed up autoinjectors and added health analyzer to regular first aid. 2012-11-11 11:45:24 +01:00
giacomand@gmail.com
2cefee1282 -Added advance diseases! Virology can create and mutate advance with different symptoms and effects. Read my comments if you're interested in each symptom.
This isn't done, I still need to add more symptoms and a way for virology to identify and name them.

-Metroids will die in space again.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4987 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-31 18:04:04 +00:00
Chinsky
27eaaa01d1 Ported virus2 system and machinery.
Viruses2 do not spawn anywhere yet, until machinery is on map.
2012-10-29 04:27:58 +04:00
giacomand@gmail.com
f7c8e01955 Throwing eggs will result in the reagents of the egg reacting to the target. (Which can be a turf, object or mob) This creates possibilities like chloral eggs, lube eggs, and many more.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4956 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-25 03:49:08 +00: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
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
aranclanos@hotmail.com
d25a5d5aa3 Fixes issue 1001.
Fixes issue 994. (Chemsprayers are not included)
Fixes issue 990.
Adding some instant admin logs and server logs for some stuff in emitters/PA. See image. http://i.imgur.com/7kQpH.png

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4904 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-17 14:27:23 +00:00
cib
8f2055080d Increased blood pack volume and IV injection rate. 2012-10-15 19:48:20 +02:00
cib
150d7e51b5 Added some medical stuff to the map.
Also added blood packs.
2012-10-15 19:17:38 +02:00
cib
a577c0bfac Fixed a few bugs with IV drips. 2012-10-15 18:01:31 +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
Kortgstation@gmail.com
80d18c4b1e Mediborg's hypospray produces Doctor's Delight instead of Tricord.
CMO's hypo starts filled with Doctor's Delight.

Syndicate simple animals have a higher block chance vs projectiles than they do vs melee attacks (there are just way too many guns strewn about my map for them to live long otherwise)


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4877 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 19:05:48 +00:00
petethegoat@gmail.com
edb2283ab4 Removed the Boo! verb.
Fixed ghosts being able to rotate chairs.
Removed the chance for players to hear muffled speech when ghosts talk.
Removed the syndicream reagent, and replaced it with doctor's delight in the two snacks it was in.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4876 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 18:48:23 +00:00
cib
e77afd5ab9 Added bleeding and blood transfusion. 2012-10-13 09:45:33 -07:00
johnsonmt88@gmail.com
a65f8c3ff8 Admin Observers have lost two verbs: 'gibself' and 'investigate' by request.
Telebacon has been commented out. Fixes(haha) issue 999.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4851 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-13 03:10:34 +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
d_h2005@yahoo.com
4d74a9f252 -Adds cherry seeds to the seed vendor
-Adds some recipes for cherries and cherry jelly
-Standardizes the vendor's seed count to 3 for all (though the plants that make you high starting with more seeds than everything else was a humorous commentary). 
-New sprites for eggplants/seeds!!!
-Making ambrosia salads removes the toxin from them now. 

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4841 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-09 21:54:36 +00: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
d_h2005@yahoo.com
b0c1d91a6f Fixes issue 954.
Fixes issue 952. 
Fixes issue 951. 
Fixes issue 949. 
Fixes issue 946. 
Fixes issue 944.

Committing Aranclano's bevy of bugfixes. All credit/shrieks-of-fury to him.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4815 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-05 21:17:04 +00:00
Cael_Aislinn
6bd0e536bd Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/datums/organs/organ_external.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/hud.dm
	code/game/jobs/job/captain.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/recharger.dm
	code/game/objects/hud.dm
	code/game/turfs/turf.dm
	code/modules/client/client defines.dm
	code/modules/clothing/head/misc.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/clothing/under/miscellaneous.dm
	code/modules/mob/living/carbon/alien/humanoid/hud.dm
	code/modules/mob/living/carbon/human/hud.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/monkey/hud.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_helpers.dm
	code/modules/mob/mob_movement.dm
	code/modules/mob/screen.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/power/cable_heavyduty.dm
	code/modules/projectiles/guns/energy/temperature.dm
	code/setup.dm
	config/game_options.txt
	icons/mob/screen1_Midnight.dmi
	icons/mob/screen1_Orange.dmi
	icons/mob/screen1_alien.dmi
	icons/mob/screen1_old.dmi
	icons/obj/atmospherics/passive_gate.dmi
	icons/obj/pipe-item.dmi
	interface/interface.dm
2012-10-05 22:21:26 +10:00
CIB123
5d6203c8ff Bugfix: The feature to dissolve pills in a container with reagents in it now works.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4792 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-01 19:02:25 +00:00
d_h2005@yahoo.com
d8fcb3576f Commiting Pewtershmitz' wooden table and floor sprites.
Adds Cheri trees, sprites by Pewter. They're not in the vending machines yet, until we get some foods for them going.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4789 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-01 00:53:46 +00:00
Erthilo
c00b0ae84d Added attack logging, some moderator groundwork, fixed alien species and save files. 2012-09-23 21:49:25 +01:00
Cael_Aislinn
e645d78f11 Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/datums/organs/organ_internal.dm
	code/datums/vote.dm
	code/defines/atom.dm
	code/defines/procs/gamehelpers.dm
	code/defines/turf.dm
	code/game/algorithm.dm
	code/game/cellautomata.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/wizard/rightandwrong.dm
	code/game/jobs/job/captain.dm
	code/game/machinery/computer/ai_core.dm
	code/game/machinery/computer/law.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/teleporter.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/structures/electricchair.dm
	code/game/turfs/turf.dm
	code/game/vote.dm
	code/hub.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client defines.dm
	code/modules/food/food.dm
	code/modules/food/meat.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/hud.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/login.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/new_player/login.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/photocopier.dm
	code/setup.dm
	icons/effects/genetics.dmi
	interface/interface.dm
	interface/skin.dmf
	maps/RandomZLevels/fileList.txt

various misc mergefixes and todos

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-22 21:29:04 +10:00
d_h2005@yahoo.com
3c589fc824 -Replaces all metroid sprites with rorobeast sprites.
-Removes jars which were redundant and used nowhere else but metroid jelly stuff. Rorojelly now comes in a beaker.

I've replaced most of the important names and messages where applicable. Going through and replacing all instances of the word 'metroid' with 'roro' in the code is a project in itself.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4714 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-17 19:39:11 +00:00
petethegoat@gmail.com
91b8ea22d5 Fixes issue 818.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4698 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-16 01:59:37 +00:00