Commit Graph

685 Commits

Author SHA1 Message Date
cib
d0735e9a87 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature
Conflicts:
	code/ZAS/ZAS_Zones.dm
	code/game/gamemodes/events.dm
2012-12-16 15:10:04 +01:00
d_h2005@yahoo.com
67bab3b87f Small bugfix for extract reactions.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5340 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-16 04:17:54 +00:00
d_h2005@yahoo.com
5b10f935a3 Adds a blocked list to slime extract critter reactions, currently stocked with the "human" simple_animals - as that causes roleplay problems especially regarding the AI - and the station-eating large xeno queen boss.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5339 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-16 03:54:10 +00:00
d_h2005@yahoo.com
7e007d5730 Fixes the runtime errors that made chaos donuts inedible
(commit of the year right here folks)

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

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

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

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

Updated some guncode, mostly just adding proper text styles.

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

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

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

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

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

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



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5269 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-06 12:21:46 +00:00
Cael_Aislinn
8ae901e49d fixed data preservation, removed debugging
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-05 11:52:19 +10:00
Cael_Aislinn
21e00aa5dc some tweaks 2012-12-05 04:55:50 +10: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
giacomand@gmail.com
cd2fcfc920 -Fixed blood vomiting not hurting you.
-Removed an unneeded fingerprint proc.
-Fixed some of the blood/vomit/gibs spills not correctly processing.
-Reduced the life of a virus with no mob host.
-You can now tell how a virus spreads by the Pandemic.
-Made making vaccines quicker and making blood virals quicker too.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5232 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-30 16:37:35 +00:00
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
johnsonmt88@gmail.com
3f1fc2ef62 Reduced EMP grenade range.
- Traitor grenades: 10 heavy range and 20 light range is now 4 heavy range and 10 light range

- Chem grenades: Chemists can no longer make EMP grenades as powerful as traitor grenades unless they use two large beakers. They used to be able to make EMP grenades as powerful as traitor grenades, or twice as powerful with two large beakers. Now they make slightly weaker versions unless two large beakers are used.

- Updated the list of uplink items to show that EMP grenade boxes hold 7 grenades since someone forgot to change it.

- EMP grenade boxes cost 4 crystals instead of 3.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5222 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-29 02:20:09 +00:00
giacomand@gmail.com
fb8f3de22a Fixed an exploit with the Chem Master.
Added some general improvements.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5216 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-28 05:04:01 +00:00
Kortgstation@gmail.com
a55b8b6ad7 Ported the last of the critters to simple_animal.
Removed all critter code/replaced it with their simple animal paths where applicable.

Replaced the critters on the maps with simple_animal versions.

If I missed any vars/icons/etc when I ported them over, let me know.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5210 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-27 19:06:15 +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
9250be52a7 -Got rid of a redundant del() in the PANDEMIC. Fixes Issue 1116.
-Added a new symptom. Voice Change will randomly change the voice of the affected mob. It isn't obtainable by Mutagen and I'll likely put it in the virus crate when I have more dangerous viruses.
-Added two new symptom procs. Start() will be called once and it'll be called when the advance disease processes. Allows you to setup stuff for your symptom. End() will be called before the disease is deleted.
-Diseases that spread by blood won't spread by contact anymore. You will need to directly inject someone to get them to catch the disease.
-Put a limit on shivering and fevers.
-Added a specialvoice variable. You can use SetSpecialVoice() to set a special voice that the player will say instead. To unset it, use UnsetSpecialVoice(). GetSpecialVoice() will return the player's special voice value.
-Added two DEFINEs for the limit which is how much a human can take before taking burn damage from heat or coldness. 
-Some symptom value changes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5136 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-20 16:39:11 +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
giacomand@gmail.com
6d05ae60de Balance change: Malf AIs can't shunt from APC to APC and must first return to their core. They can also start a takeover from their APC now. This is a test run with it and if people don't like it I'll remove it.
General work to advance diseases.
-Changed the possible cures to a list which is ordered from easiest to cure to -hardest to cure.
-Some tweak valuables to symptoms.

-Air alarms will update their window when you cut/pulse wires.
-Re-added analysers to mechanical (blue) toolboxes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5125 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-19 18:30:05 +00:00
Chinsky
684679cefb Fixes issue #1971
Lasertag and practice beams won't explode tanks anymore.
2012-11-18 11:24:17 +04: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
giacomand@gmail.com
e2acdcfe47 -Admins can now make their own advance diseases via the secret button! Instead of the useless "virus2" button, there will now be an option called "Create Your Own"! Use this button and pick from 5 symptoms to make your disease from.
-Fixed a bug where blood/vomit decals would be creating new viruses.
-Medical computer won't recognize advance diseases... for now.
-Used english_list when displaying symptoms.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5100 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-17 19:53:00 +00:00
aranclanos@hotmail.com
0258d5be22 -Changed all minerals path from /obj/item/stack/sheet to /obj/item/stack/sheet/mineral. (This change excludes glass, Rglass, metal and plasteel)
-Reduced the chunks of code about minerals in door_assembly.dm

Preeeetty much this commit is just to update all the files to the new path of the minerals. From here, if I can, I'll start changing one by one to remove the huge chunks of code.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5087 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-16 15:00:09 +00:00
Ater Ignis
8c5b8f8d50 final pass of merging with my branch
I hope I have not forgot anything
Still, it compiled for me at least, and passes test cases i did
2012-11-16 18:54:43 +04: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
9afc2cbe7f -Chemical implants can now hold 50 units instead of 10.
-Made mutagen a catalyst instead of an ingredient. Fixes Issue 1100.
-Spellbook and Teleport Scroll doesn't show up for other players now.
-Added a syndicate intercom in the wizard's den.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5072 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-15 08:03:05 +00: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
d71cc8f3d6 -Advance diseases were given a good bug fixing based on reports and runtimes. Including the diseases spreading correctly.
=Proposals=

-Cyborgs can now beep and ping.
-Hulks will now talk in all upper-case and will spurt out random hulk phrases and flex.

=Sprites=

-Improved APC sprite by TankNut.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5031 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-09 21:12:59 +00:00
Ater Ignis
af0593e07b Chemistry on child reagents and in mobs
Ethanol childs (most drinks in general) are treated as ethanol in reactions
Reactions are going inside mobs, but not make bubbling effect
2012-11-09 20:53:20 +04:00
Ater Ignis
116b17e2be internal explosions
if some explosive reaction occurs - it firstly tries to explode container, next the surroundings
if container is alive - it cuts half of explosion power, if it is dead in process - cut an half again
2012-11-09 20:24:44 +04:00