Commit Graph

2195 Commits

Author SHA1 Message Date
DarkTechnomancer
b99dae5c89 Fixed health analyzers 2012-10-15 02:57:48 -04:00
Asanadas
1fcaf5b376 Nerf cheap lighters.
Signed-off-by: Asanadas <asanadas@hotmail.com>
2012-10-14 14:42:08 -04:00
cib
d5ffce8e25 Fixed a bug with blood drips being limited to 1 per turf rather than 3. 2012-10-13 10:31:37 -07:00
headswe
2326abe31b Merge pull request #1754 from Whitellama/master
Ports/Fixes for the merge!
2012-10-13 07:00:40 -07:00
cib
5a1df1362a Medical stacks(bandages etc.) now are non-instant again. 2012-10-13 05:45:15 -07: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
06d47ea2dd Cyborgs can now use their respective channel. 2012-10-12 14:56:34 -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
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
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
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
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
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
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
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
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
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
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
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
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
daniel.cf.hultgren@gmail.com
0456d6901b * Upgraded the UI for area scrubbers
* The RD Area scrubbers are now unwrenchable, and the computer is a "wireless" computer working at a 25 square range (Just covering whole RD)
* You can no longer screwdrive/weld a open falsewall

As always, please report any error that you might find.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4781 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-30 17:04:51 +00:00
daniel.cf.hultgren@gmail.com
58dfdf5026 uruereruguu
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4776 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-29 23:14:57 +00:00
daniel.cf.hultgren@gmail.com
20edf15eab * You can now properly import baystation and oldpiano to the new piano
* Fixed the BPM +/- signs
* Fixed the violin


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4775 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-29 23:11:19 +00:00
elly1989@rocketmail.com
999cc84c1c Resolves Issue 976 - gibs are now anchored again
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4770 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-29 05:56:41 +00:00
rockdtben@gmail.com
4d236debd8 Applied Aranclanos's patch. http://www.nanotrasen.com/phpBB3/viewtopic.php?f=16&t=10099
Fixes issue 928 
Fixes issue 936

Remove a small bit of code rot in robot_items.dm


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4768 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-28 23:13:50 +00:00
elly1989@rocketmail.com
eb10f04ea3 obj/hud is now datum/hud. There was no need for it to be an object.
Moved some of the static overlays such as the dither effects, druggy effect and blurry-eyes into datum/global_hud. Meaning that only one object is instanced per server rather than per mob. It reduces on code.
Commented out a green and red overlay which aren't used, which were being instanced for every mob.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4767 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-28 23:02:11 +00:00
quartz235@gmail.com
a6e7c085ef Revert's cib's BS12 merge by XSI's orders
- Tested with various damtypes/locations/mobs but if i'm a dumbass and overlooked a problem feel free to punch me and revert this

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4762 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-27 02:14:21 +00:00
Cael_Aislinn
640ce4fd5c WIP mergefixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-26 20:10:58 +10:00
Cael_Aislinn
b618eeef82 Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport
Conflicts:
	code/controllers/configuration.dm
	code/game/atoms.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/factions.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/verbs/ooc.dm
	code/game/verbs/who.dm
	code/modules/admin/admin.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/mob/living/login.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/paperwork/paper.dm
	config/config.txt
	html/changelog.html
	icons/mob/human.dmi
	icons/mob/human_face.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-26 18:49:18 +10:00
daniel.cf.hultgren@gmail.com
fc4a98ba39 *Reworked Piano, now optimized and whatnot, new interface
*Updated changelog

Please notify me of any bug so it can get fixed.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4757 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-25 18:35:16 +00:00
rockdtben@gmail.com
b4815552ba cart.dm: Removed a useless line in my commit from r2436.
FEA_gas_mixture.dm: Removed comments that documented a removal of useless variables. I will let the SVN handle documenting that.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4752 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-25 10:08:49 +00:00
Erthilo
a88c318051 Attack logging, better intent switcher HUD, alien species fixes, misc admin commands, moderator commands. 2012-09-24 17:56:49 +01:00
elly1989@rocketmail.com
f8da06db13 Re-added the default-vote config option for voting. For every client connected more than the total votes, it will add 1 to the default vote option (No restart or the current game-mode).
/obj/admins is now /datum/admins because that's what datums are for you silly people
Moved var/datum/marked_datum from /obj/ to /datum/admins
admin datums are persistent throughout the round. They are stored in the var/list/admins rather than the ranks. This is so admin preferences may be moved into the datum to have them persist even after Login/Logout/Disconnects.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4749 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-24 11:40:41 +00:00
Erthilo
c00b0ae84d Added attack logging, some moderator groundwork, fixed alien species and save files. 2012-09-23 21:49:25 +01:00
petethegoat@gmail.com
c0fb0c2776 Committing space violins, with sprites and sounds by Sly.
Also, larva moving sprites, by Sly.

Added the violin to the map, and fixed a floating lightbulb in the execution room.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4743 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-23 18:58:42 +00:00
giacomand@gmail.com
b37ad5df02 -Changelings will start with the free powers. Meaning they don't have to buy it everytime.
-Buffed paralyse sting to 20 weaken. I made this change due to the new choking, as it was nearly impossible for the changeling to have enough time to sting their victim and get them into the killing grab, while before it would be extremely easy.

-When editing someone's memory and making them antags, it will display a warning message to admins to notify them of your action.

-Fixed EMP'ed lockers not updating their icons when they're unlocked.
-Lowered the cost of the agent card to 2 Telecrystals.
-When vent crawling, welded vents won't show up in the list.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4740 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-23 15:35:07 +00:00