Commit Graph

763 Commits

Author SHA1 Message Date
Miniature
2159409d53 Merge branch 'master' of git://github.com/Baystation12/Baystation12
Conflicts:
	code/game/vote.dm

Because I did it derpily.
2011-12-03 19:30:28 +10:30
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
Tastyfish
8c596e5c53 added sleeping on logout, willful sleeping, custom event message, slots 2011-12-02 17:28:24 -05:00
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
LastBattaWolf@hotmail.com
b00324f430 fix for issue 224 by quarxink desu
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2586 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-01 21:56:08 +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
Tastyfish
e89488975f we work for NanoTrasen! Also, we don't have enough people for your fancy
15-person minimums
2011-11-29 00:19:37 -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
rockdtben
9aecc4286b Implemented more getters/setters for damage system.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2555 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-26 12:58:15 +00:00
Albert Iordache
4a4353e1fc Commented out some more forum-sql related code 2011-11-24 13:41:20 +02:00
Baystation12
c1cc954e94 Merge pull request #22 from Tastyfish/master
Merged tg's and bay12's paper code, and closed a possible exploit.
2011-11-24 03:21:07 -08:00
Tastyfish
cc14ed34a5 Merged best of tg's and bay12's paper code, and closed a possible exploit 2011-11-23 23:09:18 -05: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
Albert Iordache
34c84bbd6d Adding to #8. Edited README.txt, removed forum_activation.dm from the .dme, and added in the hub password 2011-11-21 20:44:57 +02:00
rockdtben
84888d5ec3 git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2536 316c924e-a436-60f5-8080-3fe189b3f50e 2011-11-20 15:53:23 +00:00
rockdtben
e7a0a44ea4 Implemented adjustToxLoss(amount)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2535 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-20 10:25:24 +02:00
StrumpetPlaya
593e380133 Screen flashes red when hit by melee or projectiles. 2011-11-20 02:54:48 -05:00
rockdtben
f733c08847 Implemented adjustToxLoss(amount)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2535 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-20 00:12:49 +00:00
Albert Iordache
028014415f Merge branch 'master' of https://github.com/Abi79/tgstation13-git
Conflicts:
	html/changelog.html
2011-11-19 10:48:17 +02:00
rockdtben
38d90773cc Implemented getToxLoss()
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2528 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-17 23:42:09 +00:00
petethegoat@gmail.com
d49739c021 Fixes issue 178. Including placing modules into disposals.
Removed the maze button from the admin panel, no more dumb runtimes from that.

Window fix by Tobba, which lets you attack a window with a crowbar when you're unable to pry it into or out of the frame.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2526 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-16 20:42:05 +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
Zachary Wilson
8f61d60d64 Corrected issue #8 on Baystation12/Baystation12. 2011-11-15 17:57:41 -06:00
rockdtben
faee0422ae implemented getOxyLoss()
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2520 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-14 14:44:52 +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
rockdtben
c0c83b72d1 Commented out a var for later use.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2507 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-10 15:02:27 +00:00
rockdtben
c7d883a413 Fixed it now.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2506 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-10 15:01:18 +00:00
rockdtben
ff84314ce6 Added a getBruteLoss() proc to mob.dm and then replaced all calls of bruteloss with it. Except for the ones commented out.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2505 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-10 14:45:25 +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
petethegoat@gmail.com
bae68c2db1 Several map changes:
fixed the disposal in the incinerator not leading to space.
restocked the chem closet- it now contains an anaesthetic closet, which might be interesting.
removed the glass windows from the front of the QM desk.
possibly a few other changes, nothing significant though.

Added the firing range, courtesy of vey.
Don't get too excited, it's still under construction.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2498 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-08 00:15:16 +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
mport2004@gmail.com
fbd0a5a9b5 Timers will no longer go off when you set them to 0 unless they are on.
Unsimulated turfs can be climbed on once more.
Small blobs can use the blob to move around in space.
Jetpacks now have a toggle for the stabilization.
Jetpack fuel use has been reset to .01.
Moved most of the tanks over to a new folder and files so they are not all crammed into one.
The meteor event actually spawns more than one wave worth of meteors.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2488 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-05 05:25:22 +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
panurgomatic
3517810d11 - Added atom/proc/search_contents_for. Recursively searches through all contents of all atoms inside specified one for matches, returns a list of found atoms.
- Added teleporter datum. do_teleport proc is now just a wrapper for it.
- Added damage absorption to mechs.
- Added mecha step and turn sounds.
- Cleaned effects code a bit.
- Metal foam should now block air movement.
- Since sd_ lightning library chops areas into pieces, turrets now work with master area.
- Tried to optimize DesignHasReqs proc.
- Added plasma converter and laser cannon mecha equipment.
- Other cosmetic changes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2463 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-31 22:09:36 +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
baloh.matevz
830b28dc7f - Feedback gathering thing updated. Now it finally supports actual SQL data storage.
Use the global procs to gather feedback:

feedback_set(var_name, num)
feedback_inc(var_name, num)
feedback_dec(var_name, num)
feedback_set_details(var_name, text)

The values are saved to the database at the end of the round, if it ends properly.

Currently the following information is stored:
- Time when round starts
- Mode
- Time when round ends

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2450 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-30 04:31:49 +00:00
vageyenaman@gmail.com
313d99d003 ○ Fixes for announcements and comm consoles.
○ FINALLY FIXED THE REQUEST CONSOLES BEING SHITTY WOOOOOOOO
○ You can now do line breaks in the admin centcom announcements, just simply hit enter.

○ You can now name portable / constructed turrets properly by using a pen on their frame before you finalize the construction. Joy!


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2449 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-29 20:20:39 +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