Commit Graph

1969 Commits

Author SHA1 Message Date
giacomand@gmail.com
bc51528d7d This commit is so it is possible to get a secret AI running without it being announced.
-Removed the "X is your AI." message and the sound that played. (I accidentally committed it before asking carn for permission, so it won't show up here but I just commented out the sound() and the world << message.)
-Uncommented the old welcome message for game start.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4885 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-15 18:44:29 +00:00
petethegoat@gmail.com
cfb1ad5551 Committing for Aranclanos:
Fixes issue 986. (Constructed normal walls named wrong)
Fixes issue 1000. (Destroyed vent still shows up in air alarm)
Fixes issue 1003. (Glowshrooms don't give off light when planted!)
Fixes issue 1004. (Issues with (?) Command)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4884 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-15 16:45:18 +00: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
giacomand@gmail.com
3dd4f8cbc5 -Optimized freelooking a bit.
-Larva can now die, instead of staying in critical.
-Improved the prison break event.
-Added the cameranet to the list of debuggable controllers (I know it's not technically a controller but it seems like the best place to be).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4858 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-13 19:52:41 +00: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
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
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
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
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
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
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
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
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
giacomand@gmail.com
e064bd15bd -Tweaks to purchasing free changeling powers when making a changeling.
-Add an "if(usr != src) return" check in the AI's topic.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4778 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-30 13:53:49 +00:00
elly1989@rocketmail.com
dde2c51e73 Fixes an obscure runtime which happens when there are no human players and an Ion-Storm occurs.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4771 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-29 06:15:38 +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
giacomand@gmail.com
4ef1ae9634 -Fixed changelings being unable to use their powers. (Sorry about that)
-Fixed runtimes with the camera tracking.

-Fixed an issue where alien larva couldn't heal oxygen loss damage.
-Fixed a runtime with cameranet chunks.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4761 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-26 23:36:15 +00: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
Erthilo
c00b0ae84d Added attack logging, some moderator groundwork, fixed alien species and save files. 2012-09-23 21:49:25 +01: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
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
CIB123
d6dfd49a75 Ported parts of the BS12 organ system.
This includes:
- Individual wounds
- Dismemberment
- Bone breaking

It also adds configuration values to config/game_options.txt to control the point at which bones break and limbs are cut off.

Does not include surgery or bleeding yet.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4720 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-18 21:32:39 +00:00
giacomand@gmail.com
0fbfa48217 -Added more info for admin messages in these areas:
Chem smoke will say what reagents are in the chem_smoke.
Added a more_info ? to the last fingerprint that touched the grenade.
Added a more_info ? to bomb's last fingerprint and the attacher.
Admins get a warning message when someone summons guns.
Added a jump link to bomb's activation location.
Added a jump link to chem smoke's activation location, it will also show you the area's name.

-NarSie won't follow mobs in another Z level.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4719 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-18 09:49:51 +00:00
petethegoat@gmail.com
99745c2295 Fixes issue 929.
Changed nuke ops to use buffed C20Rs again, hurray!
Cleaned up the nuke shuttle code in preparation for fixing issue 854, and renamed var/derp.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4701 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-16 12:42:58 +00:00
giacomand@gmail.com
33c738de3e -Fixed an issue where you would compare your name with yourself to see if it was available.
-Fixed an issue with the Upgrade Camera malf module.
-Fixed an issue with HTML codes in whisper.
-Ghost ears and eyes default to 0.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4700 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-16 05:43:27 +00:00
Kortgstation@gmail.com
d85e161c4d Fixed checking for assassination targets. It checked for them on 8 or higher, the away mission Z is 7.
A number of computers no longer work on Z7 (away mission).

-AI upload
-Security cameras
-Crew monitoring computer
-Comms console
-Robotics console
-Security records

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4699 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-16 04:36:58 +00:00
giacomand@gmail.com
1d72e3c4e9 -Fixed issue 913
You'll have to write the name on the paper itself now.

-Fixed issue 912
-Fixed issue 909
Also, Cyborgs without names are called "Default Cyborgs". 

-Fixed issue 908

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4680 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-12 08:57:30 +00:00
Kortgstation@gmail.com
ed3f216514 Cult swords are force 30 now, and don't fit in bags or on belts. Use the damn robes they come with if you want to use em.
Artificers no longer have delay on spells, but can't create R-Walls

Carp attack damage is now 15 flat, having a chance to deal only 5 makes them far too weak.

Bears now actually have an attack value higher than zero, so players keyed into the bear can attack.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4672 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-10 01:31:54 +00:00
giacomand@gmail.com
384b2717b0 -Added a "landmarks_list"; the game will now check for landmarks in the list instead of the world.
-Did some optimizing to AI freelook.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4670 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-09 22:27:06 +00:00
petethegoat@gmail.com
8a7e4e4ed5 A little bit more away mission work. It should technically be playable.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4663 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-09 01:29:05 +00:00
elly1989@rocketmail.com
278aacd80a Changelings absorbed by other changelings can no longer rejuvenate back to life. This means changelings can no longer absorb eachother and rejuvenate to share genomes and absorbedcounts.
Fixed the transform to initial appearance adminverb.  I'm assuming it got broken when DNA was changed.

Made the cloaked-xeno sprite slightly more visible.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4656 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-08 08:16:37 +00:00
Cael_Aislinn
f7fcfa2a6f Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4649)
Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/machinery/computer/law.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/food/recipes_microwave.dm
	html/changelog.html
	icons/effects/effects.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-08 14:22:44 +10:00
Kortgstation@gmail.com
6deb60261d Summon guns now auto activate when you buy it. Because it auto-activates, there is no risk of wasting points by buying multiple uses at once, nor does it appear in some random tab of its own.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4634 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-06 04:55:31 +00:00
Cael_Aislinn
56f5cb9e4e Merge tgstation r4633 into bs12_with_tgport
Conflicts:
	code/defines/obj/costume.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/structures/crates_lockers/closets/fitness.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/living/simple_animal/parrot.dm
	code/modules/power/power.dm
	code/modules/power/switch.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-06 13:13:57 +10:00
giacomand@gmail.com
2499ce6b6e -Some more html fixing, for communication runes and books.
-Added a badmin secret.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4631 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-06 01:05:32 +00:00
giacomand@gmail.com
f97f3982bc -The upgrade camera malf module now upgrades cameras to be motion cameras too.
-Made the alarm delay a variable and I decreased it to 10 seconds. There's another 10 seconds in queueAlarm, so it's 20 seconds total before the motion alarm triggers.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4625 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-05 17:00:17 +00:00
Cael_Aislinn
dc3f6f2239 Merge branch 'bs12_with_tgport' of github.com:caelaislinn/Baystation12 into bs12_with_tgport (probably broke ZAS again)
Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/defines/obj/weapon.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-04 22:23:50 +10:00
Cael_Aislinn
c4bd191222 Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)
Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/defines/obj.dm
	code/game/gamemodes/events.dm
	code/game/machinery/newscaster.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/game/turfs/turf.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/maps/fromdmp.dm
	code/modules/mob/living/silicon/ai/freelook/eye.dm
	code/modules/mob/living/silicon/ai/freelook/update_triggers.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_movement.dm
	code/setup.dm
	icons/mob/uniform.dmi
	icons/obj/closet.dmi
	icons/obj/clothing/uniforms.dmi
	maps/RandomZLevels/assistantChamber.dmm
	maps/RandomZLevels/fileList.txt
	maps/tgstation.2.0.9.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-04 22:19:03 +10:00
giacomand@gmail.com
2233a58fe1 -Added a new malf module. Malf AIs can upgrade cameras to be EMP Proof and have X-Ray. Same amount of uses as reactivating cameras, same cost too.
-Cleaned up cameras a bit.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4617 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-03 23:15:38 +00:00
Erthilo
3aa8982a81 Merged money, ATMs, bible changes, nullrod changes, policetape. 2012-09-03 01:29:53 +01:00
johnsonmt88@gmail.com
0d9da06677 Added an attack sound to:
Glass shard
Broken bottle
Sord/Claymore/Katana
Cult blade
Kitchen knife/Butcher's cleaver
Nettle/Death nettle
Hatchet

Thank you carn for testing this for me :)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4580 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-29 16:04:23 +00:00
giacomand@gmail.com
0b0719f2bb -Made wizard require at least 20 players, instead of any. This is hopefully stop a low pop wizard from killing the whole crew and not calling the shuttle until an admin intervenes.
-Made nuke ops require at least 20 players. I did this because 15 wasn't low enough and it is a 5 heavily manned organized team vs 10 crew members who are just going along their own business.
-Made the spells only target living mobs. This was because the spells were listing the AI eye as a target.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4573 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-28 11:24:59 +00:00
Cael_Aislinn
e6078b100f Merge tgstation r4572 into bs12_with_tgport, fixed missing title screen (tgside problem?), some conflicts
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-28 20:22:22 +10:00
Cael_Aislinn
eacd84b212 Merge tgstation13 r4570 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/defines/obj.dm
	code/defines/procs/helpers.dm
	code/defines/turf.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/cult_structures.dm
	code/game/gamemodes/events.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/master_controller.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/item.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/wires.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/new_player/login.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/unused/toilets.dm
	html/changelog.html
	icons/effects/alert.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-28 19:57:11 +10:00
giacomand@gmail.com
a84ccb93ff -Fixed an issue where you couldn't send messages to people inside lockers.
-AI has to double click to move by turf.
-If more than a certain number of alarms are triggered, the AI and Cyborg will instead receive a message saying how many alarms have been triggered and of which type, they will then get a link to the "view alarms" proc. This also counts for cleared alarms.
-Fixed an issue with creating turfs and it not showing up on the camera.
-Modified the "Communication Blackout" event. It will now notify the AI that comms are down, if it is var/silent. Increased the EMP duration for telecomm machines.
-Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4572 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-28 08:13:00 +00:00
johnsonmt88@gmail.com
240d910679 Meteor guns!
It's a gun that fires meteors! Admin spawn only.

They do not shoot 'real' meteors, they shoot a projectile that acts like meteors.

Note: The meteor projectile calls 'meteorhit()' which some objects and turfs do not have, so some things won't really be affected by them.

The gun itself has a potato battery, meaning it starts with a charge of 100 and has a maximum charge of 300. It costs 100 to fire and recharges 100 every 5 ticks.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4538 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-25 16:39:18 +00:00