Commit Graph

8886 Commits

Author SHA1 Message Date
quartz235@gmail.com
6acd7511e0 okay please commit this time i am tired of your lockout errors
moved cloning-related computers to a new dm in game/machinery/computer/
switched dna modifiers from machinery/ to machinery/computer
fixed issue 243
fixed a bug that using a screwdriver on a teleporter beacon would move the beacon in your hand and make the screwdriver unusable/undroppable

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2734 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-18 16:51:23 +00:00
kortgstation@gmail.com
0c0f7ee62c Hurr durr I'm fucking retarded forgot to check a file last commit.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2733 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-18 16:05:13 +00:00
CompactNinja
f401c2e9ed Yes CN, ckey IS all in lower case. Lil' insignificant bugfix on my behalf.
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
2011-12-19 01:37:53 +10:30
Tastyfish
e85b253eb3 Merge remote-tracking branch 'upstream/master' 2011-12-18 06:12:21 -05:00
Tastyfish
7d48e87e2a made 2-eared setup prettier 2011-12-18 06:12:00 -05:00
Albert Iordache
bca2746d7c Fixed a spelling mistake. 2011-12-18 13:05:18 +02:00
Albert Iordache
f4a24a9804 Merge pull request #118 from SkyMarshal/master
Removed a lot of goonish flavor text, resprited emag and centcom id.
2011-12-18 03:03:04 -08:00
Tastyfish
e3219fd09d 2 ears! 2011-12-18 06:02:15 -05:00
SkyMarshal
fda118e9ac Reworked emag again, new centcom id sprite, removed derpy flavor text. 2011-12-18 03:20:54 -07:00
kortgstation@gmail.com
20cff88a8a Added the Staff of Change gun, a self recharging weapon which cannot be placed in a recharger. It fires bolts of change
Added a new projectile "bolt of change."
When struck by a bolt of change, a mob will be randomly transformed into one of the following:
-Alien (Drone/Sentinel/Hunter)
-Metroid (Adult/Baby)
-Cyborg
-Monkey

The staff is admin only as of now.

Fixed some bits on the salvage shuttle.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2731 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-18 09:31:16 +00:00
Albert Iordache
1816be90a0 Merge pull request #117 from SkyMarshal/master
Again, check description.
2011-12-18 00:28:53 -08:00
SkyMarshal
3d51c2487b Fixed a bunch of descriptions. 2011-12-18 01:06:05 -07:00
SkyMarshal
9c1b83bd88 Fixed some derp. 2011-12-18 00:26:53 -07:00
SkyMarshal
fc3914364f Finished pepperspray, added mace item, improved security console, and a few other things. Will know when I see the diffs. 2011-12-18 00:23:02 -07:00
quartz235@gmail.com
b35ef49a09 stop finding ways to centcom god damnit
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2729 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-18 04:17:21 +00:00
Tastyfish
64cad184a1 dna scan 2011-12-17 23:06:58 -05:00
baloh.matevz
e381b3c3fe Attention! Space is now (finally) UNPOWERED.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2728 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-18 03:50:55 +00:00
Tastyfish
75ddaeb9f9 Merge remote-tracking branch 'upstream/master' 2011-12-17 21:52:05 -05:00
Tastyfish
a741413992 carve books, remove immovable rod/gr3y t1de 2011-12-17 20:46:42 -05:00
SkyMarshal
a0298c0477 Should improve pepper spray a bit. Reduced to 2 shot per Hawkie's request. 2011-12-17 18:37:23 -07:00
vageyenaman@gmail.com
34dad73dfa Small fix for corgi equipping window. Instead of creating a duplicate window every time the name changes, it'll use the currently opened one.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2725 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-18 00:52:17 +00:00
baloh.matevz
3b5643d578 Ian (<3) can now wear all sorts of hats which affect what he says and does.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2723 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-18 00:43:28 +00:00
baloh.matevz
bd26fea4be Feature request by muskets: Player panel now also searches through jobs.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2722 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-17 23:35:04 +00:00
vageyenaman@gmail.com
1fcc338970 Fixed the cloners not displaying messages and errors properly. Why the hell were they commented out?
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2721 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-17 18:51:03 +00:00
trubblebass@gmail.com
7f8e1b3df1 Comitting on behalf of RavingManiac
- Fixes a minor bug with Tape Recorders.
- Changes their playback text to maroooooooooooon.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2719 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-17 16:14:04 +00:00
Miniature
f0aadd4c70 Merge pull request #112 from Miniature/master
Sanity checking for secret (step 1 in fixing hideous number of runtimes)
2011-12-17 05:26:02 -08:00
Miniature
803f79c165 This should lower the hideous number of runtimes we've been having lately. 2011-12-17 23:49:20 +10:30
baloh.matevz
a16730d0bb 48x48 pixels... started a file for walls in 48x48.
If you want to work on it and test it, just make a new dmi with the ratio of 48x48 pixels and then open code/defines/world.dm and add the following line to /world

icon_size = "48x48"

Assign the new dmi file to the objects you're using and compile.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2718 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-17 10:56:11 +00:00
uporotiy
c48b97519e Spells can now be based on the variables of their holder for cost. This allows cool things like a spell that deals 20 fire damage to you when you cast it.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2717 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-17 10:46:04 +00:00
Albert Iordache
d8d876681e Merge pull request #110 from SkyMarshal/159ce32cc7ed547c2004fcc260c16282a415afbc
Too long for the title, check the description
2011-12-17 01:27:00 -08:00
quartz235@gmail.com
00ecb93235 Committing this for ravingmaniac
New universal recorder:
- Timestamps each line of dialogue
- Skips pauses longer than 20 seconds during playback
- Able to print out transcript

Sample image: http://i.imgur.com/qIJmW.png

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2716 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-17 08:33:48 +00:00
baloh.matevz
1ac6e27795 updated the player panel.
Demo page:
http://www.kamletos.si/tgdb/playerpanel.html

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2715 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-17 08:26:23 +00:00
kortgstation@gmail.com
8a0ed73812 Added the justice costume (which is basically a slightly touched up ninja suit) and five different coloured JUSTICE HELMETS for Quarx/Lasty.
Added a new costume landmark, which spawns one justice suit/one randomly chosen colour of helmet, so the costume has a chance of appearing in the theatre.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2713 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-17 06:09:59 +00:00
quartz235@gmail.com
fc005237c1 MAN I AM JUST SO MANY KINDS OF DERP TODAY
uploaded an old item.dm, this should be the right one (should be meaning it is because i just made super sure)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2712 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-17 03:19:56 +00:00
quartz235@gmail.com
9acbbe7f1f Fixing a derp in r2704
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2711 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-17 02:57:55 +00:00
quartz235@gmail.com
3b3073eb44 Fixed being unable to finish AI creation
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2710 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-17 01:16:33 +00:00
baloh.matevz
7c4dee0d2d Coded in a round-start hierarchy displayed to you when you are assigned a job.
So the text you now see at the start is...

The current game mode is - Traitor!
There is a syndicate traitor on the station. Do not let the traitor succeed!
You are the Chemist.
As the Chemist you answer directly to the chief medical officer and the research director. Special circumstances may change this.

Added this to the changelog.

If other servers wish to change this they can just do so by editing the supervisors variables in the files in

code/game/jobs/job/

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2709 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-17 01:08:53 +00:00
quartz235@gmail.com
26abf951e2 Fixes:
Issue 241
Issue 237
and
Issue 240

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2708 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-17 00:14:11 +00:00
vageyenaman@gmail.com
853d78c331 Bugfixes:
▫ Fix for Issue 161
   ▫ Fix for Issue 239
   ▫ Circuit imprinter runtime involving Atmosphereic Alert circuits.

▫ Capitalized some letters in the security level messages. Because that really annoyed me!

▫ Merged Donkieyo's patches with the master branch. (Forum post: http://nanotrasen.com/phpBB3/viewtopic.php?f=7&t=7051)



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2706 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-16 23:47:49 +00:00
quartz235@gmail.com
19b78328f3 Fix for issue 246
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2705 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-16 21:37:42 +00:00
Xenusicelon
419f25c3df Fix for Issue 245 by Quarxink
http://code.google.com/p/tgstation13/issues/detail?id=245#c0

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2704 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-16 21:04:20 +00:00
trubblebass@gmail.com
ebb1905879 Fix for Pete's fix.
It should work properly now.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2703 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-16 17:07:23 +00:00
petethegoat@gmail.com
ceaffa789f Malf AIs can no longer occupy non-station z-levels.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2702 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-16 16:31:09 +00:00
ryantennessee@yahoo.com
4b42fe2b97 Quarxink fixing invisible fried ex and fixing an earlier derp with supplyshuttle.dm
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2701 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-16 15:19:15 +00:00
ryantennessee@yahoo.com
f024aba1a5 Quarxink update flip mode eyewitness news
- Stopped an exploit to get to centcom (for justice)
- Added 5 second cooldown to printing requisition to stop spam (also for justice)
- Atmos pipes are now backpackable and do damage because they're FUCKING PIPES (not really for justice but just a pet peeve)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2700 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-16 15:08:59 +00:00
baloh.matevz
ea2062e13f Possessing stuff now sends admin messages.
Possessing and then releasing something restores your original name. Works even if you possess several things one after another as well as if you release an object without having possessed it in the first place.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2699 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-16 15:00:41 +00:00
Miniature
8b15283862 Made sandbox not votable 2011-12-16 22:25:02 +10:30
baloh.matevz
e2a8a5e8bb added a proc for feedback feedback_add_details(var/variable,var/details)
This adds the contents of the details variable at the end of the variable, which is defined in the variable variable. You know this last line makes perfect sense.

It also adds a space between what is already in details and what you're adding.

in effect it's a 

s += " content"

Added an autogibber. If you bump into it from the right end, it gibs you.

Added an exit into space at engineering, by the escape pod.
- External airlocks require engineering + external access
- pod airlocks don't require any access

Added an exit into space at the pod in security
- External airlocks require security + external access


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2698 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-16 09:40:14 +00:00
SkyMarshal
159ce32cc7 Improved pepper spray, added a safety catch to pepper spray and space cleaner, added a wire to reset the module of a borg. 2011-12-15 23:58:17 -07:00
baloh.matevz
15918b2e18 Added a config option which forbids the possessing of singularities. This option defaults to allowing the possession of singularities.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2697 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-16 06:06:16 +00:00