Commit Graph

2330 Commits

Author SHA1 Message Date
CIB123
fad4dcbada Merge branch 'cib' of github.com:CIB/tgstation13 into cib
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4729 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-19 18:54:49 +00:00
CIB123
a7cba9170d Fixed a problem with organ name display.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4728 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-19 18:04:35 +00:00
Kortgstation@gmail.com
3b9e914f32 Clown and carp are faster now so they can actually catch their targets.
Camera lists don't include mobs on away missions.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4727 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-19 05:55:08 +00:00
CIB123
b555f5a0f0 Fixes a few issues with the organ system.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4722 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-18 21:34:05 +00: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
Kortgstation@gmail.com
4199496a34 Clowns have better reaction time in response to being attacked or witnessing their fellows in combat.
Changed their default intent to harm and made it possible for them to collide with/block other mobs (two hostile clowns chasing me got stuck swapping places forever trying to get at me in testing).

Their attacks now have a horn sound.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4715 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-17 22:43:25 +00:00
d_h2005@yahoo.com
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
Kortgstation@gmail.com
ab6f97bc75 Work on NPC clowns for the clown planet away mission.
They start peaceful, but attacking them causes them to attack you like a carp.

Attacking a clown will also make all other clowns that can see the attack hostile.

If a clown sees a clown attacking someone, they'll join in the attack

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4711 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-17 06:20:37 +00:00
elly1989@rocketmail.com
9265255ab5 Fixes an issue where areas were set with luminosity = 1. Not sure why the hell I done that and why the hell I never noticed it. Thanks Kor.
Once again, Only crates may be sold on the supply shuttle.
Changed adminverb updates to be called by Login if holder.state changes. This is so we don't have to mess around with it elsewhere and we don't have to call it as often.
Added some missing verbs to the clearadminverbs proc
Fixed a icon reference not using the fullpath (Goddamn stop doing that)
Going catatonic makes you fall down
All mobs with the resting variable can now unrest (god damn what were you doing).
"Lay down / Get up" was renamed to "Rest".
Rest now uses src rather than usr (again, wtf)
Added some ugly fatty fat hacky code to make admin-ghosted mobs appear braindead rather than catatonic
Admin-ghosting (set-observe and set-play) merged into one verb named "Aghost" (short for admin ghost, same convention as asay)



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4708 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-17 02:27:12 +00:00
johnsonmt88@gmail.com
a49a37686f Dead sprite for parrots.
Both Pewter and I completely forgot about this until I was already adding them. Thanks again for the great sprite Pewter!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4706 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-17 01:25:49 +00:00
johnsonmt88@gmail.com
caa3f8055d Parrots:
- Parrots now have absolutely gorgeous sprites thanks to Pewtershmitz
- Removed a few "world <<"s that I missed
- Fixed parrots picking up their own headset (and duplicating it)
- Fixed parrots not properly running away from carbon mobs

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4704 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-16 18:34:39 +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
petethegoat@gmail.com
382012f1f0 Removed those ugly hazard doors!
Fixes issue 922.

Includes single tank bombs in the .dme for live testing.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4696 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-16 00:39:18 +00:00
elly1989@rocketmail.com
9b072d55ac Committed some new hotkeys.
Hotkey-Mode: (hotkey-mode must be on)
TAB = toggle hotkey-mode
a = left
s = down
d = east
w = up
q = drop
e = equip
r = throw
t = say
x = swap-hand
f = cycle-intents-left
g = cycle-intents-right

Normal-Mode: (hotkey doesn't need to be on)
Ctrl+a = left
Ctrl+s = down
Ctrl+d = east
Ctrl+w = up
Ctrl+q = drop
Ctrl+e = equip
Ctrl+r = throw
Ctrl+x = swap-hand
Ctrl+f = cycle-intents-left
Ctrl+g = cycle-intents-right

Admin:
F5 = toggle-admin-observe (WIP)
F6 = player-panel-new
F7 = admin-pm
F8 = (WIP)

Regular controls aren't affected.

There's an additional option to press the TAB key to switch into a hotkey-mode. It's a toggle, so it stays on until you press it again. It switches focus between the map and input-bar for you. This mode defaults to off so you won't even notice it unless you decide to toggle it on with the TAB key. Whilst using this hotkey mode you get additional options like pressing "T" to say something.

The mode switching (TAB key) is completely client-sided.

http://nanotrasen.com/phpBB3/viewtopic.php?f=15&t=10024

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4686 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-13 15:30:47 +00:00
giacomand@gmail.com
0f1940b015 -Made the admin "floor is lava" secret to only hurt carbons. Otherwise activating it would kill the AI everytime, since it cannot move.
-Fixed following not working right. Optimized "observe".

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4685 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-13 09:29:30 +00:00
elly1989@rocketmail.com
e317396894 Removed the obj/screen/MouseEntered and MouseExited() proc defines as they cause clients to send more data to and from the server fairly constantly and create additional overheads for little purpose. I'll do a poll on the forums to see if people still want the intent switcher changed from a toggle to a 4-quadrant switch thingy like other servers have. From the DM reference:
"Don't define this unless you need it, because it generates extra communication that is otherwise avoided. Defining it on only the objects that require it reduces overhead"
I've tested it and it has these overheads for all hud objects.

Added stethoscopes. They are a tie. You can use them to listen for somebody's pulse. Mostly a RP-fluff item. "You place the stethoscope against her chest. You hear a healthy pulse and respiration." You need help intent and it will give different text for each body-part. I might make it more detailed later.
Removing ties from a uniform will now try to place it in you hands.
Stethoscopes placed in a few places around medbay.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4682 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-12 14:13:25 +00:00
giacomand@gmail.com
2bc3ec67f1 -Improved the singularity. It was using 3 for(in range) loops when it could be easily be brought down to a single loop.
-Changed grabbing's constructor to allow parameters for the grabber and the grabbee. (I made a simple little tweak and look at all the files I had to change :( )

-Easter Egg: Clowns have a chance of reducing or increasing the singularities energy. Upper and lower limit is 300 and -300.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4681 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-12 11:17:49 +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
giacomand@gmail.com
9b78786611 -The AI can now select a name after being AIed by someone placing their brain into the core. Fixed Issue 857
-You can't show messages to dead/clientless AIs by putting a page of paper up to the camera.

-Ghost following will get a list of mobs from getmobs, it'll sort it by mob type and by name.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4679 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-12 02:53:50 +00:00
Kortgstation@gmail.com
3e96bdc5e8 Hulks can't use guns. Hopefully this encourages them to actually go around punching things instead of having their magic stun immunity shield while playing normally.
Alien queen regen is now 5 instead of 15. Will this fix aliens? No. But it will make it so they're not immortal in the mean time.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4676 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-11 03:43:30 +00:00
giacomand@gmail.com
e1bdd57bf2 -Fixed holopads not letting you holo_talk when you weren't on the holopad.
-AIs can now double click on living mobs (/mob/living) to instantly start tracking them.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4673 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-10 09:45:07 +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
johnsonmt88@gmail.com
c7947ef236 File restructuring: ohgodihopenothingbroke edition.
All /world/ stuff that I've found is now in code/world.dm instead of being scattered throughout the code in 6-7 files.

*****IMPORTANT*****
This means that hub.dm is now part of world.dm. Server hosts using the hub will likely have to redo the hub/password variables!

Again, that stuff is now located in code/world.dm
*******************

The tester list has been removed as it is not in use.

/code/defines
- Moved atom.dm code into /code/game/atom.dm and atom_movable.dm
- Moved hub.dm code into /code/world.dm
- Moved the /defines/tanning into objects/item/sheets/leather.dm
- Moved /defines/area/ into game/area/
- Moved turf.dm code into the code/game/turfs folder and divided it up into meaningful places

A lot of the files in /code/game were placed in new areas since they really didn't have a reason to be there.
- algorithm.dm: 
- - The world stuff is in world.dm. 
- - countJob() and AutoUpdateTK() were removed entirely (unused).
- - AutoUpdateAI() is now in /mob/living/silicon/ai.dm

- atom_procs.dm was split into atom.dm and atom_movable.dm

- cellautomata.dm
- - World stuff was moved into world.dm
- - Atom stuff was moved into atom.dm and atom_movable.dm
- - Atom verbs were moved into code/game/verbs/atom_verbs.dm

- chemistry.dm
- - Beaker box code was moved into storage/misc.dm
- - The trash can and 'alechemy' paper were removed. (unused)

- Landmarks.dm was moved into /objects/effects/landmarks.dm

- prisonshuttle.dm, specops_shuttle.dm, syndicate_shuttle.dm and syndicate_specops_shuttle.dm have been moved into game/machinery/computer/

- status.dm and topic.dm code were moved into world.dm

- step_triggers.dm are now in objects/effects/step_triggers.dm

- throwing.dm was split into appropriate files (carbon mob code, atom_movable.dm, ect)

- vote.dm is now in code/datums

/code/game/asteroid was split up.
- turf.dm was moved into game/turfs/simulated/asteroid.dm
- artifacts were split up
- - Wish granter is now in game/machinery
- - The stealth box is gone (unused)
- - The list of 'space suprises' was moved into astroid.dm
- asteroid.dm, being the only file left, was moved into /code/game


and finally...
modules/mob/organs files are now in code/datums/organs

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4659 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-08 22:11:02 +00:00
johnsonmt88@gmail.com
60fe91a622 I ticked the wrong file in... mob.dm in the last commit did nothing.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4658 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-08 19:50:10 +00:00
johnsonmt88@gmail.com
727c367de0 More work on parrots.
They now mimic speech! I've also fixed a few bugs (like a missing if(stat) check in life) I think all that's left is to tweak their speed a bit and if possible, see if I can make it so that parrots peck out human's eyes when they attack.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4657 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-08 19:48:05 +00:00
Cael_Aislinn
6d6c328c03 limits alien players in any round to 20% of total alien/human players (ignores ai/cyborgs)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-08 15:30:14 +10: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
elly1989@rocketmail.com
8432491e46 Corgis don't talking! :(
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4649 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-08 02:09:48 +00:00
elly1989@rocketmail.com
8683eda506 Removed some punctuation from Ian's pirate costume-name.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4648 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-08 02:03:36 +00:00
johnsonmt88@gmail.com
7514e800d5 Must have had some kind of hiccup, the 'return' didn't get committed?
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4647 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-07 22:15:15 +00:00
johnsonmt88@gmail.com
438d55ed44 The late-join button now requires the ticker's state to be GAME_STATE_PLAYING.
Meaning that you can not late-join before the round actually starts or after the nuke up/malf ending cinematic.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4646 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-07 22:04:55 +00:00
elly1989@rocketmail.com
ca7cb95b7d Moved cyborg law-syncing back into New().
New Borgs now sync with the AI with the fewest associated borgs. So, say there were 3 AIs and 6 borgs, each would get two each.
Cyborg cells now default to 7500 (like the transform procs do), this is so admin-spawn borgs don't end up with 1500-charge cells with a max of 1000-charge.
Default lawset is asimov rather than an empty lawset
pulsing a borg's sync wire will cause it to randomly pick an AI.
As a borg, your laws are shown to you at login.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4641 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-07 09:24:54 +00:00
giacomand@gmail.com
65a4545784 -Attempted fix for messages being sent twice. I added a variable to keep the "spawn(10) recent_messages = list()" in sync, so only one broadcaster can do it at a time. Added the frequency of the message, so you can send the same message on multiple frequencies via multiple radios.
-Added an "in machines", for the AI call shuttle proc, so it doesn't look in the world.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4640 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-07 04:39:44 +00:00
giacomand@gmail.com
565b868ebc -Added a presets file for telecommunications. Moved all presets there.
-Made the Chief Engineer's cigarette spawn unlit. It was causing runtimes and everyone else spawns with unlit cigarettes.
-Updated changing AI name so it changes the eyeobj and the PDA, removed the PDA name from ai/life.dm()
-Removed a useless comment in uplinks.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4636 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-06 09:36:45 +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
Cael_Aislinn
ad75e6b352 merge with tgstation's r4618, removed some broken bs12 merges (organs, pain)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-06 13:09:20 +10:00
giacomand@gmail.com
db2d703f72 -Holograms can move around again. I'm also experimenting with them being area based, meaning they can move around an area freely and lose their hologram when they leave the area. I've made it a const option, so change HOLOPAD_MODE to 0 to return it to the old system, which will destroy the hologram when it is out of range of the holopad.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4633 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-06 02:33:30 +00: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
6117b5d02f -Fixed Issue 849
-Fixed some other occurrences of this happening. If you find any, please post it here: http://nanotrasen.com/phpBB3/viewtopic.php?f=7&t=9955 
or let me know in #coderbus.

-Split up the Core() verb a bit.
-When sending messages to Centcom or the Syndicate, with the communications console, it would never reset itself since it resets the wrong variable. I've given it the correct variable and I made the cooldown 10 minutes instead of a minute.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4629 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-05 23:42:04 +00:00
giacomand@gmail.com
5ed77f8dad -Made motion cameras use HasProximity if they aren't area based motion cameras. This will allow people to set up motion cameras that will set off, without having to be in an "AI Monitored" area, such as EVA.
-Removed cameras from all bots. I'll change this if there's an outcry but my reasoning is that the bot's cameras don't work well with freelook, removing it would save a lot of trouble and would help out in certain rounds. I also doubt people even care about viewing the bot's view, I sometimes forget it's a thing.

-Make the AI's cancel camera view the same verb as AI Core. I did this because people were getting really confused on how to return to their core view, and the verb was basically useless since people just stopped tracking by moving a tile in a random direction.

-Removed a floating camera in Engineering. -Removed a camera in the AI Chamber (front of the AI) and I made the camera an "All" camera. (EMP Proof, X-Ray and Motion)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4622 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-05 05:30:56 +00:00
johnsonmt88@gmail.com
ec0ef6e42a Committing the parrot stuff I have so far. It is still a work in progress and I've made sure it's not possible to spawn them yet.
So far they walk around, find a perch and sleep on it... They don't copy speech yet but they do look around for items to steal to add to their collection! So basically I have made a magpie so far... The parrot bits will come later I swear.

They currently use the baby chick sprite but there's a much better sprite already in the works thanks to Pewter.


Oh also, I've moved that headset/ear variable out of simple_animal and into simple_animal/parrot since only parrots can do anything with them anyway.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4620 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-05 02:04:54 +00:00
giacomand@gmail.com
b888b60567 -Increased the delay for the recent messages filter to reset. This will hopefully stop telecomms from broadcasting twice during lag.
-Added obj/effect's to update what the AI can and cannot see. Resin walls and smoke can block vision.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4619 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-04 14:09:18 +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
f1d3bdb8e7 -Tweaked cameras based on feedback!
It takes no time to open camera panels now.
There's no chance that pulsing a wire will set the alarm off.
Properly killed the camera from processing, if it isn't a motion camera.
Added some extra feedback to welding.
EMPing cameras will set their alarms off, if it passes the first prob check.

Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4613 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-03 13:46:48 +00:00
petethegoat@gmail.com
fc2596f3a3 Added ties. Ties that you can wear.
TIIIIIESSSSS

Currently there are three types, none are on the map, all are fabulous.

Lawyer suits and some others will need updating before they go in.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4611 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-03 02:27:18 +00:00
giacomand@gmail.com
6e925f0701 -Obj/structure were being initialized before cameranet. I've added ticker checks to stop the runtimes that you get everytime you start the server..
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4608 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-02 23:52:30 +00:00
giacomand@gmail.com
c207124142 New item "camera assembly" that is dispensed from the autolathe. (700 Metal/300 Glass), deleted old grenade camera assembly.
It will construct a camera after doing the following steps:
Wrench it to attach it to a wall
Weld it to the wall with a welding tool (Welding Helmet Required)
Attach wires to the camera
Possible extra steps in order to create special cameras (X-Ray, EMP Proof, Motion) (You can have more than 1 special attachment, meaning it can be possible to have an EMP Proof, Motion, X-Ray camera)
X-Ray will need carrots (something for botanists) (this will possibly changed, well it will definitely carrots are weird)
EMP Proof will need solid plasma.
Motion will need a prox sensor.
Screwdriver the panel closed to complete the camera.

To deconstruct the camera, it would be not so difficult to disable but it will take a while to completely remove it:
Screwdriver the panel open
Cut all the wires, cutting the alarm wire is optional.
Weld it.
It is now a camera assembly again.

Gave the cameras wires to cut/mend/pulse. Random wires for every camera to make hacking it harder.
Focus wire. Will make the camera have a shorter or normal vision range.
Power wire. Will disable the camera. Pulsing will make it kick anyone who is viewing it through a security computer. Will give a tiny shock if not protected.
Light wire. Will disable the "Toggle Camera Light" that the AI has. Pulsing it will disable/enable it.
Alarm wire. Will warn the AI that a camera's alarm has been set off, when this wire has been cut/pulsed. Does nothing else. Should only triggered once, meaning.. setting off the camera won't set it off ever again..
Special wire. Will toggle the special attachment of the camera. Pulse toggles, cutting disables, mending enables.
Nothing wire. Does nothing, just here to add more wires and make guessing which wire does which harder. x 3

Placed extra cameras, I can't recall all the places but here are some.
Around solar array entrances
Around EVA
Around the security back maintenance door
Place an X-Ray camera in the Living Quarters.
Bartender back room
Virology living quarters
Chapel crematory
A camera on the outside of Telecomm's external airlock
X-Ray camera outside every escape pod station.
Inbetween toxins test site and the station(?) There's cameras there already
Inbetween viro and medbay i think ^ I mean inside maintalright
private study? (library back room)
engineering secure storage
X-ray camera in toilets (both of them)
Both maintenance access that you find between important areas (captain room, teleporter room)(HoP office, staff meeting
Custodial Closet
Surgery Observation
Atmospherics Maintenance
Infront of Atmos
mining maintenance
Kitchen cold room
Hydroponics Storage
Emergency storage (both)

Other Map changes
Add red phone in Cyborg Station
Add AI restorer to Cyborg Station room
Added some camera assemblies in the Cyborg Station, inside a crate!

TODO:

Get camera alarms to give the AI a link to press, to jump there.
Standardize wires or something. There's a lot of copy+paste..

OTHER:

With the new camera stuff I got rid of the default x-ray cameras. Though there still are x-ray cameras placed around, watching you sleep.

Added Lugar223's improved vending interface. http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=9586

Some runtime fixes.

Added a second buffer for Cyborg cameras. Hopefully it'll make freelook less laggy.
Increased the first buffer to 2 seconds.
Some tweaking to stuff.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4606 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-02 23:20:40 +00:00
elly1989@rocketmail.com
73e5c38a56 Preparations for reducing the number of processing machines at round-start. There are currently 8000 or so at round start, this was already pruned to 2800ish by doohl's stuff.
machine.process() now uses a return value to remove itself from the processing machines list. This is more efficient and will help reduce costs especially at round start where some 5000+ machines were removed from the list using first-find. Now there is no searching involved. Instead of machines.Remove(src) just do .=PROCESS_KILL that will return the flag to the proc which called it (the MC) and trigger its removal from the list. If you're deleting something don't even bother removing it from the machines list, there is no need to.

Simplified the last_processed stuff for the MC. It's now a single variable rather than 3. It is simply a typepath rather than a reference to an object (this is so it works even if said object is deleted)

MC stats in admin status_panels now show the length of the processing lists (indicated by #). I've just realised I forgot to mention what the abbreviations are:
The less obvious ones are: Dis=diseases; Net=pipes; Pnet=powernets; Mch=Machines; Tick=the game-mode ticker.

Beach-water now uses an overlay image rather than a separate object.

Fixed a typo in the shuttle console.

Hydroponics trays no longer use first-find within their process() for checking the plant is in the tray (why is that even there anyway? talk about lazy)

Removed some junk/placeholder procs like organ/proc/process() return

Removed newscasters from the processing machines lists.

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