Commit Graph

9304 Commits

Author SHA1 Message Date
Chinsky b2d3d880e1 More work on surgery system.
Appendectomy fully working
Bone surgery working

Added bone gel and bone setter items

Made bandaging stop bleeding instantly, instead of waiting for next wound update.

Added variabe to groin organ to track appendectomy stage.
2012-10-13 16:28:10 +04:00
Travis Whitehead 5184ca58f5 Roller beds are collapsible and the ChemMaster lets you specify pill/bottle color, once more 2012-10-13 03:44:19 -07:00
cib 9ae4bbfdf8 Fixes the say_quote runtime. 2012-10-12 16:15:34 -07:00
cib 06d47ea2dd Cyborgs can now use their respective channel. 2012-10-12 14:56:34 -07:00
cib 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
cib 5ef6399238 Fixed a ton of the issues in http://piratepad.net/9CwFobI4lZ 2012-10-12 13:58:18 -07:00
cib 89263fc9f6 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-10-12 13:19:20 -07:00
cib fbc903e59c Added a new surgery system. 2012-10-12 11:09:21 -07:00
Mloc 33a3d3cd97 Merge pull request #1738 from CIB/master
Dismemberment
2012-10-12 09:42:31 -07:00
Cael_Aislinn 3e11992cce re-added game panel for admins and added zas options, extended postgame restart delay from 25 seconds to 60
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-13 00:01:45 +10:00
Cael_Aislinn 6fc9aab4f6 some merge fixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-12 18:21:50 +10: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
johnsonmt88@gmail.com e3b3ff836b The wizard's teleport scroll now only works if the wizard actually has it. Fixes issue 997.
I've also moved the teleport scroll define from defines/obj/weapon.dm into scrolls.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4846 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-11 23:07:34 +00:00
giacomand@gmail.com 5eba2eda1d -Added a new Game Master fun button. It will set the default player OOC colour to whatever the user chooses.
http://i.imgur.com/xRM7j.png

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4845 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-11 22:24:08 +00:00
elly1989@rocketmail.com a640d10307 The icon_state of space turfs is now generated by jumbling up its x y and z coordinates. This means when space turfs get deleted the icon_state doesn't change each time and look stupid.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4844 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-11 21:59:01 +00:00
cib fb60301594 Revert "Revert's cib's BS12 merge by XSI's orders"
This reverts commit a6e7c085ef.

Conflicts:

	baystation12.dme
	code/datums/organs/organ_external.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/hud.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_defines.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/mob_defines.dm
	code/setup.dm
	icons/mob/dam_human.dmi
	icons/mob/human.dmi
2012-10-11 14:31:31 -07:00
Cael_Aislinn 7cd66f0cfd runtime fix
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-12 01:37:06 +10:00
giacomand@gmail.com 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
Kortgstation@gmail.com 67433021a1 Combined the PDA constructor things. My bad.
Replaced all the for mob in range show in Syndicate.dm etc with visible_message.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4840 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-09 19:42:57 +00:00
Kortgstation@gmail.com 18608f3ca6 Added Syndicate NPCs/sprites for them. They come in a few varieties, some with shields and swords, some with guns(yes they shoot). They're simple animals, but they drop a corpse landmark when they die, so you can loot them normally.
A plea to admins: Dont fucking spawn these everywhere, they're meant to be used as badguys in away missions, not for you to fuck up every round by spawning 70 of them.

Clowns also drop a real (lootable) body on death.

Added new corpse types. Syndicates as well as several civillian jobs.

Added a new area/copied a shuttle icon over into floors as part of work on my map.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4839 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-09 19:22:14 +00:00
Cael_Aislinn f22948967f tweaks to game start / admins, fixe for adjacent reaching not working
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-10 00:41:50 +10:00
Cael_Aislinn c6916f678d updated changelog, added new TG notif type to show tg ports
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-09 23:15:28 +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 825a7dcbf9 various mergefixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-09 22:49:38 +10:00
giacomand@gmail.com 7d6fb8fd6a Commiting for Aranclanos.
http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=10189&p=143580&hilit=https%3A%2F%2Fwww.dropbox.com%2Fs%2Fcwflgm7793ts20s%2FBorgsForCasualsRELOADED.patch#p143580

-Fixed some ugly text in Ion laws "THE STATION IS [0x6006265] FETISHES...LAWS UPDATED".
-Fixed some typos on the Ion laws.
-When borgs are emagged, now they show their laws for themselves.
-When new laws are uploaded, the borg gets instantly the new laws, just like the AI, instead of the confusing message "Your AI has set your 'laws waiting' flag.". Remember this is a patch for casuals.
-The borgs gets the same message than the AI in Ion storms.
-Made the admin Ion storm show the "...LAWS UPDATED" text.
-Borgs get a different law 0 telling them to help their master.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4837 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-09 05:37:28 +00:00
Kortgstation@gmail.com f8aaa0104f Pens no longer spawn in your pocket, rather a pen will spawn in your PDA.
Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4835 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-09 01:37:15 +00:00
giacomand@gmail.com eb68c1e510 -You can now only hear from headsets when it is on your ear slot. People around you won't be able to hear your headset anymore.
-The firedoor wasn't updating the freelook camera. When I looked at it I couldn't figure out why it was using it's own "rebuild" code, supposedly it only updates the air that it set in the dir variable but the current map doesn't utilize it at all (firelocks with a dir of 8 which are lined horizontalally), and you would have to have two thick wide firelocks to make it effective. I've commented it out and I'll put it back in if we have problems.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4832 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-08 03:52:25 +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
sieve32@gmail.com c9897bf3f7 -Fixed Fire Alarm timers, the issue was caused by the fact that they were no longer processing, on account of it not really being necessary. I changed it so that they only process so long as they are timing, and changed the timing to work off of world.timeofday so it won't be affected by lag (Did that for the purpose of shenanigans).
Fixes Issue 987
-Added donkie's list shuffle for Space Ninjas, was trying to work on Issue 904 and saw that it didn't shuffle the candidates so I added that, though I doubt it will fix the problem.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4828 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-07 21:45:04 +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
giacomand@gmail.com 5a3af8cefe -Commiting Skasi's extra buttons for the Gas Supply Control computers in atmos.
http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=10383

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4817 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-06 06:00:19 +00:00
d_h2005@yahoo.com b3397d62ac Fixes issue 953. Patch by aranclanos.
Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4816 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-06 00:50:07 +00: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
giacomand@gmail.com 3a0c239dfa -Fixed a funny bug where weed nodes wouldn't stop growing.
Which lead to this: http://i.imgur.com/8BFce.jpg

Added a node_range variable, which can be VVed to get the same result as the bug.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4813 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-05 13:58:08 +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
giacomand@gmail.com 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
giacomand@gmail.com 2e3d42dfb1 Changed aliens considerably.
-Aliens now take damage when they are in a hot environment.
-Aliens now take more damage from fire damage. ( * 1.5 the amount)
-Alien facehuggers are always active and they'll latch onto people who walk by them, and not just walk on them. Commented out "activate facehuggers".
-Eggs will now open to nearby possible hosts. If they're still nearby, the facehugger will latch onto them. New icons by WJohnston.
-Aliens will now see the shuttle ETA.
-Drones can't evolve into queens/princesses if there's already an alive queen.
-Made queen heal a little bit faster (5 to 10). The queen was regenerating at the same rate as her underlings, and the queen is much more important now.
-Moved some copy+pasted stuff into the "mob/living/carbon/alien" class, so larva and humanoids shared stuff.
-Disarming a cyborg stuns them a little longer.


Added a piece of paper on the DJ station that helps people setup the telecommunication machines there and listen onto private frequencies.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4810 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-05 04:36:24 +00:00
giacomand@gmail.com baf9b75e2b Quick fix for Cyborgs being unable to mend/cut/pulse camera wires.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4808 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-04 22:21:42 +00:00
sieve32@gmail.com 8c387f2158 -Made all contructs children of /mob/living/simple_animal/construct and changed the type paths as needed
-Now when examining someone you can tell if their brain is missing, and it doesn't give the 'catatonic' part (Because the player is in a different mob and it's kind of misleading)
-Committed Lugar223's patch for the temperature gun, preventing the window from re-opening as it heats up/cools down
Fixes Issue 900
-Fixed the issue where dead players could use pAI carts if they left the window open
Fixes Issue 967
-Changed how the Destructive Analyzer handles sheets, now it will only deconstruct 1 sheet out of the stack at a time. Also found a bug where it would destroy its own components, so that is fixed as well.
Fixes Issue 989
-Secborgs can no longer put their stun baton or energy gun in rechargers, added a check for /mob/living/silicon
Fixes Issue 972

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4807 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-04 22:08:27 +00:00
baloh.matevz 148b6e5c19 - Moved TAGGERLOCATIONS to setup.dm for easier access and lookup.
- Added an areatest verb to debug verbs. This tests areas for whether they have APCs, air alarms, etc.
- Added an 'autoname' subtype of obj/machinery/camera. Cameras of this type auto-assign their c_tag, based on which area they're in, followed by a number. For example "Male Dorm #1", "Male Dorm #2", etc.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4806 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-04 21:01:42 +00:00
d_h2005@yahoo.com 5110786735 -Adds the missing sprites to that cute witch hat, and allows it to be spawned in the theater, along with ausops' cute sundress because it's also cute and I didn't have anything else to spawn with it. honk.
Let's keep gearing up for a great halloween! 

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4803 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-03 22:17:17 +00:00
giacomand@gmail.com 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
baloh.matevz af9386df3d - Carpets are now their own floor type. You can remove carpet pieces with a crowbar, like most other floors, and you can place new ones down. They will auto-update their design to match.
Screenshot:
http://www.kamletos.si/carpets.png

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4801 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-03 00:51:40 +00:00
baloh.matevz b6fa1445f9 Fixes issue 974. When using metal on a girder as a cyborg, the girder will no longer disappear randomly.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4798 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-02 22:16:15 +00:00
baloh.matevz 45acf4146e - Fixes issue 985. false walls are now called 'wall' instead of 'falsewall', which made them obvious.
- Moved some smothwall code from smoothwall.dm to false_walls.dm to make it so doubleclicking falsewalls actually gets you to the define.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4796 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-02 21:40:36 +00:00
d_h2005@yahoo.com 60bce6c53b -Adds a new wizard artifact, the gem-encrusted hardsuit. Attack protection is equal to the highest values of robes + normal rig suit, and it allows spellcasting like a normal set of robes. Maybe now wizards can stop dying after blinking into space/teleporting to Borg Deathsquad Arrived.
And hopefully they WON'T use it to explore the derelict all around every round. We'll see.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4794 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-02 05:34:03 +00:00
rockdtben@gmail.com a39705d4d4 The RCD code is less ugly now.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4793 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-02 00:35:00 +00:00
baloh.matevz f4e366abc5 - In answer to the ransom demands, added a plaque to the AI Upload room.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4787 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-30 20:20:23 +00:00
elly1989@rocketmail.com 8be72ec797 Added some stand-in sprites for medals.
They remain admin-spawn only until there's proper sprites for them.
The only one which isn't admin-spawn is the one the captain spawns with (it's on his jumpsuit)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4786 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-30 20:01:10 +00:00