Commit Graph

831 Commits

Author SHA1 Message Date
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
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
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
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
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
Tastyfish
61ae382c16 added categories to QM stuff so it isn't a giant several-page list 2011-12-10 01:25:27 -05:00
Albert Iordache
3efa552eda Merge branch 'master' of https://github.com/Miniature/Baystation12 into Miniature-master
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
2011-12-09 14:56:32 +02:00
Tastyfish
14f0a4d0b9 UnRevert "the closet tg merge broke my charge crates"
This reverts commit 2694238e88.
2011-12-06 21:04:41 -05:00
Tastyfish
ecb6f2b2d6 Revert "the closet tg merge broke my charge crates"
This reverts commit 2694238e88.
2011-12-06 21:00:08 -05:00
Tastyfish
2694238e88 the closet tg merge broke my charge crates 2011-12-06 20:35:07 -05:00
Miniature
af301633f6 Merge branch 'master' of git://github.com/Abi79/tgstation13-git
Conflicts:
	baystation12.dme
	code/defines/obj/vending.dm
	code/game/machinery/vending.dm
	html/changelog.html
	maps/tgstation.2.0.8.dmm
2011-12-07 07:53:20 +10:30
uhangi@gmail.com
44c0cfc46d -Adding pepper spray for security officers.
-Fixed a storage bug for chemsprayers and space cleaner

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2618 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 22:42:18 +00:00
baloh.matevz@gmail.com
9c872b28e1 Reinforced metal renamed to steel, since that what it now is.
Steel floor tile renamed to metal floor tile to avoid confusion before it even happens
Grass plants in hydro will now actually make grass floor tiles instead of really awkward patches
You can no longer make steel via autolathe, you can however make metal, and inserting r-metal will still give you metal for use in the lathe
Added 10 sheets of steel to EVA and 10 units of steel to engineering


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2604 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 03:55:58 +00:00
petethegoat@gmail.com
5d4b707553 Fixed all known problems with vending machines.
Fixed a minor visual bug with emagged lockers.
Minor botany rebalance by Numbers.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2595 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-03 15:36:17 +00:00
Miniature
f62eccc76b Merge branch 'master' of git://github.com/Abi79/tgstation13-git
Conflicts:
	baystation12.dme
	code/defines/mob/mob.dm
	code/defines/obj/vending.dm
	code/game/atom_procs.dm
	code/game/dna.dm
	code/game/machinery/computer/aifixer.dm
	code/game/vote.dm
	code/modules/chemical/Chemistry-Machinery.dm
	code/modules/chemical/Chemistry-Reagents.dm
	code/modules/mob/living/carbon/metroid/life.dm
	html/changelog.html
	icons/obj/stationobjs.dmi
	interface/skin.dmf
	maps/tgstation.2.0.8.dmm
2011-12-03 19:28:10 +10:30
n3ophyt3
67e43e4baf New toy, as coded by Threadstrong.
A delightful fake sunflower, that also doubles as a squirtgun. Refillable via watertanks.

Currently adminspawn only because I am too lazy to make it spawn anywhere right now.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2589 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-02 01:51:40 +00:00
petethegoat@gmail.com
a80e46c078 Fixed issue 222.
Improved closet/secure closet/crate code a bit. (Updated the paths on the map.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2585 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-01 20:02:43 +00:00
Tastyfish
26e1bfdaf1 Added vending charges, removed clown/mime from main joblist, sec belts fixed 2011-11-30 18:34:43 -05:00
petethegoat@gmail.com
85cb13fe95 Reverted the janitor closet to the old trashbag. (It does work, I fixed it up in r2557.)
A bunch of fixes for various stuff that's been broken about the bag of holding. It should work as intended, now.
Made wet floor signs fit in boxes.
Cleaned up the janitor's closet a bit.
Optimised the vault wiring a bit.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2580 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-30 15:02:01 +00:00
kortgstation@gmail.com
763c0ecf71 Can now make light tubes/bulbs in the autolathe
Old trashbag was buggy as fuck and useless. Didn't touch it's code, but replaced it's spawn in the janitors locker with a 20 slot, tiny item only storage object (new trashbag)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2577 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-30 05:35:40 +00:00
Tastyfish
e58dd6030f Auto-flush disposals, auto-hush vendending machines 2011-11-29 02:42:08 -05:00
tronaldnwn@hotmail.com
9038cfdda7 Food:
Cream pies splat when thrown.
Chaos donuts more chaotic (reduced amount of reagents need to make)
Mystery stew more mysterious (Changed recipe)
Wish Soup some times grants your hungry belly's prayers (new icon).
Meat pie recipes condensed.
Grilled cheese sandwiches
Some reagent amounts may have changed as a result of me seeing them not match the amount of reagent put into making them.
Terribad food descriptions added or modified.


Autolathe has light bulbs, APC parts, and wires in the creation list!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2558 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-26 16:09:34 +00:00
petethegoat@gmail.com
2190408f0f Massively improved trashbags. PICK UP EVERYTHING! Fixed issue 209.
Slightly improved mops, and got rid of the "X attacks the blood with the mop!" message.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2557 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-26 15:58:50 +00:00
vageyenaman@gmail.com
c8452fa96b ◦ When equipping corgis with objects, their icons immediately update. Fixes a bit of visual lag.
◦ The kitchen and booze vending machines have some changed commodity values. Most importantly, kitchen has more eating utensils and trays.
◦ Changed the afterattack() and DblClick() to have the (location,control,params) parameters.
◦ Added a new radio filter, "RADIO_MAGNETS".
◦ Mucked around with /datum/signal. Just an extra variable and another comment.
◦ Guns' afterattack() proc now carries location,control,params.
◦ Projectiles now track exactly where the player clicked on a tile. Pretty neat, huh?


New stuff:
   ◦ A new machine has been added: magnetic generators. They fit under floor tiles and can create dyanmic magnetic fields by directing ionized proton/electron beams to another tile.
   ◦ Another machine/computer was added that can control these magnetic generators. These machines come with their own pseudo-scripting engine for directing the magnetic beams magnetic modules create. They're not really complete yet, but they work for the firing range. I plan on expanding on this maybe sometime in the future, creating more applications for magnets elsewhere.
   ◦ Firing range things have been added, including target stakes and targets (both sprited by Veyveyr). You can mount targets onto target stakes and shoot them. Pixel-precision aiming has been applied to the targets (ONLY THE TARGETS!) so that you can see where you shot it and whatnot. You can literally blow holes through the targets until they collapse on themselves.
   ◦ Added a small little manual to the firing range on how to use the new stuff. It hopefully isn't too complicated to use.


    

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2543 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-23 02:00:18 +00:00
kortgstation@gmail.com
f87dfdd6a9 Fixes from HG/adding his new suit to the "Select Equipment" verb
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2524 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-16 09:08:31 +00:00
petethegoat@gmail.com
7830c037c8 Fixed issue 194.
Added proper atmos tech jumpsuit, engineering jumpsuit, and rad suit inhands.
Adjusted some other inhands, including a fixed yellow suit inhand.
Added vey's proper stun baton onbelt sprites.

Changed the security flavoured EOD closet to a regular one. (reasoning being that the Sec version looked terrible)
Fixed the intercom in the bar.
Adjusted EVA to be slightly less messy.

Made the welding mask toggle position on attack_self().

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2514 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-11 17:43:40 +00:00
trubblebass@gmail.com
5020b325f9 - Fixed Issue 202
- Fixed Issue 198
- Changed Cultist de-conversion message to specify that you remember nothing about when you were a cultist.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2508 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-10 17:48:30 +00:00
kortgstation@gmail.com
c00d699ab6 Added the pirate captain stuff for HG
Changelings can now regen from death
Loyalty implants are now orderable from QM
Repair bot is now adminspawn only
Added the mech ion cannon, which is adminspawn for now
Tweaked highlander a bit
Updated the changelog

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2499 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-08 00:47:50 +00:00
Superxpdude@gmail.com
112ce9dbd7 Voice changers now share the same description as normal gasmasks.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2493 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-05 21:11:05 +00:00
uporotiy
c4b1663853 Fireaxe now has 18 force when wielded instead of 30. It destroys windows and grilles in one hit, however.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2492 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-05 20:50:12 +00:00
mport2004@gmail.com
e54ce9f2b2 There was an extra " in a desc
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2489 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-05 08:22:55 +00:00
Superxpdude@gmail.com
cf62068041 THE GREAT DESCRIPTION UPDATE PART #2
Updated more clothing related descriptions.
Radiation Suits and RIG suits now have less rad protection (90% and 60% respectively)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2487 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-05 05:00:46 +00:00
Superxpdude@gmail.com
8a900a112e THE GREAT DESCRIPTION UPDATE PART #1
Updated a lot of clothing related descriptions.
Chameleon jumpsuits, syndie shoes and voice changers now have subtle description changes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2486 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-05 04:28:39 +00:00
mport2004@gmail.com
ec507d8277 Anything that used the updateappearance proc will no longer update hair/beards. The things that use it are DNA changes, Cloned mobs, Changlings. The proc was runtiming due code on lines 234 and 246, I looked into it a bit but don't currently know how to fix it. The proc is currently commented out so at least the skin color/body updates properly.
Thanks to Exadv1 the reagent checking code for chem got a nice performance tweak.
Minor text change to the steal ai objective.
Few runtimes/nullchecks fixed.
HoS does not spawn with a flash, Warden does not spawn with a taser, Security officers now spawn with a flash.
Wizarditis has been uncommented and nerffed quite a bit.
Moved most of the suits over to the clothing module folder.
Force 0 items won't damage humans.
The two lockboxes have been readded to the armory.
The brigs extra large power cell has been cut in half. (still twice as large as normal apcs)


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2480 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-04 12:14:39 +00:00
trubblebass@gmail.com
6680db7d89 Fix for experimental weapon's crates, they had a mismatched item path and were throwing off any other crates ordered with them.
Thanks to Blaank for finding this!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2476 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-03 18:45:22 +00:00
kortgstation@gmail.com
81e2f26706 New Secborg skin by Vey
New Lasergun sprite by Vey

Various fixed in hands (by Vey)

Added a retrolasergun which uses the old sprite, put one out in space for people to find


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2465 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-31 22:33:25 +00:00
kortgstation@gmail.com
e49ec9211c Added a claymore (sword)
Re-did the Highlander button.

In place of a traitor PDA, it now strips the player, gives them a kilt/boots/beret/claymore and full access.

Objectives remain as nuke codes+escape alone.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2461 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-31 10:44:45 +00:00
petethegoat@gmail.com
c7daef1773 Forgot to update spec ops crates and the stealth bundle.
The sleepypen on the nuke shuttle is intentional.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2448 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-29 19:35:35 +00:00
petethegoat@gmail.com
2f84e522cb Stunglove overhaul: part two- gloves now lose all insulation when you wire them up.
Sleepypens have been removed!
Paralysis pens have been slightly nerfed, but look like regular pens.
Changed uplink implants to give five crystals instead of four.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2447 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-29 18:44:31 +00:00
petethegoat@gmail.com
7524bca986 Stunglove overhaul: part one.
Stun gloves are now made by wiring a pair of gloves, and then attaching a battery- this shows up on the object sprite, but not on your character.
Stungloves use 2500 charge per stun! This means that some low capacity batteries will make useless stungloves.
To get your old inconspicous gloves back, simply cut away the wire and battery.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2439 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-29 02:15:50 +00:00
uporotiy
c0d8adf42f Facehugger overhaul
They now function like landmines. They don't move, but you can pick them up and throw them at people.
Eggs now grow gradually and you can harvest a hugger from a grown egg.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2438 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-28 17:17:01 +00:00
mport2004@gmail.com
9ca449bf7a New WIP TK system added. To activate your TK click the throw button with an empty hand. This will bring up a tkgrab item. Click on a non-anchored (currently) non mob Object to select it as your "focus". Once a focus is selected so long as you are in range of the focus you can now click somewhere to throw the focus at the target. To quit using TK just drop the tkgrab item.
The captains laser, aegun, and xbow recharge a bit slower now, they recharged so fast that you almost never had to stop shooting. 
Cleaned up the cyborg_modules file
Medical and Security borgs have a hud item.
Medical bots bottles hold 60 of their chemical (up from 30).
Medical bots now have three syringes that are labeled "Syringe-(Inaprovaline)", "Syringe-(Anti-Toxin)",  and "Syringe-(Mixed)".
Medical bots now have two kelotane/dexalin pills (up from 1/ea).
Engineering bots got a new RCD thats just like the old one but the code is cleaner and meant for borgs only.
Husks brains can no longer be cut out.
Healing hands code has been removed till whoever wants to finish it adds it to a place that is NOT the base click procs.
Added veyveyr's nuke team weapon.  Its more or less the Uzi with a new icon.
Nuke teams also got a bit of extra ammo and a few more pinpointers/eguns in their locker.
Glass doors will not set opacity to 1 after they close.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2431 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-27 08:37:40 +00:00
kortgstation@gmail.com
a2557781f4 Added Vey's Jensen set+a shitty dermal "helmet" I made
Removed the nurse outfit from the theatre cause it spawns in medbay anyway


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2430 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-27 03:44:59 +00:00