7aee209637
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
2012-10-25 00:35:19 +10:00
8d22166941
- tweaked lplasma spills and fire spawning - oxygen content is no longer counted towards % spawn chance.
...
- to spawn a turf fire (at default ignition level) atmos zones now require at least 17 moles of ignitable material (note that flamethrower fuel counts 15x more than other ignitables)
the relevant code seems weird and all over the place, but this seems to work in testing so i'm committing it for now
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-25 00:33:47 +10:00
2fe846065a
-Added "give disease" VV dropdown option.
...
-You cannot spread diseases which are marked as SPECIAL or NON_CONTAGIOUS via blood injections.
-Carp no longer drift in space.
-Captain helmet now protects you from facehuggers.
-All humanoid aliens can now Regurgitate.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4946 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-24 00:29:27 +00:00
0d98248b6f
Merge pull request #1821 from comma/master
...
Pain & Other Ported Things
2012-10-23 08:47:30 -07:00
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
9340f70252
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
...
Conflicts:
icons/obj/items.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-22 19:35:03 +10:00
91b61f91e7
Readded pain and shock system.
...
Tramadol and oxycodone are back too.
2012-10-22 06:38:57 +04:00
0f88f133fb
Commiting for Numbers:
...
* Flour produce should be accurate now producing a whole lot now
* Added multipliers to grinder nutriment transformation functionality. Any negative number is treated as a multiplier now -1.5 would turn x nutriments into 1.5x products etc.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4932 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-21 21:40:16 +00:00
085f5f7fe1
Added ability to rig fueltanks
...
To make your very own ghetto explosive:
1.Wrench faucet open on tank.
2.Add assembly of your choice (only timers and radios work as triggers here)
To unmake it simply remove assembly with hands and wrench faucet back.
Rigging tank with igniter logs for admins.
Also explosion size depends on amount of fuel left in tank.
2012-10-20 22:31:13 +04:00
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
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
5f7c9d5518
Readded welder fuel.
...
Fixed issue with fire not generating light.
Fixed pre-merge issue with fuel passing through closed airlocks.
2012-10-18 21:25:24 +04:00
16e6f178a4
Buffed fuel tank explosions.
2012-10-18 15:40:55 +04:00
92276c9887
Merge branch 'master' of https://github.com/Baystation12/Baystation12
...
Conflicts:
code/modules/mob/new_player/new_player.dm
html/changelog.html
2012-10-18 09:13:24 +04:00
59964d4025
Whoops forgot a thing also reenabled a warning message but with a added check
2012-10-17 19:00:20 +02:00
ea714643b6
Hopefull fixed iv drip bug.
2012-10-17 18:27:44 +02:00
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
3b95730028
-Committed RavingManiac (Smoke Carter)'s Roros laying eggs.
...
http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=10501
-You can insert the Auth Disk by clicking on the nuclear bomb.
-Changed how aliens are selected. It will filter the list of possible candidates by checking for players who aren't inactive for more than a minute. If no possible candidates are found, it increases the filter by another minute. It does this 5 times before giving up.
-Alien embryos cannot have carriers and they are more likely to infect someone.
-The time it takes before a larva bursts is increased a bit.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4897 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-17 06:04:25 +00:00
0c97d77d77
Fixes issue with slurring never going away.
...
Ethylredoxrazine now properly fights alcohol effects.
2012-10-17 03:28:10 +04:00
3e94d7a682
Merge pull request #1768 from CIB/master
...
Bleeding fixes
2012-10-15 10:59:27 -07:00
8f2055080d
Increased blood pack volume and IV injection rate.
2012-10-15 19:48:20 +02:00
150d7e51b5
Added some medical stuff to the map.
...
Also added blood packs.
2012-10-15 19:17:38 +02:00
514989394f
Cleaned up food and drinks code.
...
God bless OOP.
2012-10-15 20:13:35 +04:00
a577c0bfac
Fixed a few bugs with IV drips.
2012-10-15 18:01:31 +02:00
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
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
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
c747e5e56e
Chloral hydrate and sleep toxin now have a small delay before taking effect.
2012-10-13 10:51:08 -07:00
e77afd5ab9
Added bleeding and blood transfusion.
2012-10-13 09:45:33 -07:00
5184ca58f5
Roller beds are collapsible and the ChemMaster lets you specify pill/bottle color, once more
2012-10-13 03:44:19 -07:00
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
32e839f683
More and yet more fixes from the piratepad.
...
- AI laws now default to Nanotrasen laws
- Removed half the random events
- Milk now in chem dispensers
- Hunger rate decreased by half
2012-10-12 14:25:54 -07:00
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
5a93673762
-Larva grow a little faster (an extra growth per life) when on weeds or when breathing in plasma.
...
-Observer following is cancelled when there's no client.
-Made facehuggers/eggs a little smarter. They won't try to go after people with masks covering their mouths (as that kills them), however when they're thrown they will still try to attach to the person.
-Improved alien stats(). You'll be able to see the max plasma and larva will see the escape shuttle.
-Blessing with a fire extinguisher wasn't working because of the volume check. Removed the check.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4842 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-10 19:56:51 +00:00
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
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
fd647f6cba
-Renamed all other references to LSD to mindbreaker.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4822 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-07 03:19:32 +00:00
07a2721996
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4821 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-07 02:51:30 +00:00
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
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
f6195ed777
-Hallucinations can be cured. Anti-Toxin and Synaptizine will cure it, while the latter being more effective at it.
...
-Forgot to commit a file.
-PDA codes aren't case sensitive anymore.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4811 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-05 05:23:28 +00:00
6aebb2b035
Masks and helmets with the Unacidable tag will now protect from acid when worn. Thanks to Zelacks for the patch!
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4805 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-04 04:15:05 +00:00
fd1df4d881
-Fixed a bug where you can get to CentComm with the wormhole generator.
...
-Fixed changeling runtimes.
-Fixed chunk runtimes.
-Fixed reagent grinder runtimes.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4802 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-03 01:35:29 +00:00
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
1c9b1a48fe
-The use_power() proc, for machines, will now default to using it's assigned "power_channel", when the proc is used.
...
-Slightly increased the power usage of the chemistry dispenser. From 2000 to 3000.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4791 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-01 17:29:35 +00:00
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
c00b0ae84d
Added attack logging, some moderator groundwork, fixed alien species and save files.
2012-09-23 21:49:25 +01:00
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
5e4535a58e
Fix Issue 886: Appearance should now update after taking ryetalyn.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4723 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-18 22:31:20 +00:00
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
Cael_Aislinn
