Commit Graph

4401 Commits

Author SHA1 Message Date
Chinsky
6256200c1a Added ability to clip photos to clipboards.
Added ability to view photos from clipboards and folders.
2012-11-04 21:03:17 +04:00
Chinsky
45a6cd0d00 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-04 10:03:45 +04:00
Chinsky
d42f601308 Ported photo system. 2012-11-04 09:53:38 +04:00
giacomand@gmail.com
b00c0c2a9f -New sprites APC sprites by TankNut!
-New wraith sprites by TankNut!
-Decreased flare duration, again(!)
-Made a based interact proc and changed the updateDialog to call that instead of attack_hand. This caused issues with the APC and getting the power cell out of it. I then changed all machines that had their own defined proc (that was everywhere)


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5001 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-03 14:45:29 +00:00
giacomand@gmail.com
4c1136b48f -Fixed Issue 864 (Moving lights from your inventory to your hand causes lumiosity to be subtracted from your mob.)
Item's attack_hand proc wasn't calling the item to be picked up if it was in your inventory, which meant that the lights couldn't update properly. By calling pickup, even if the mob was taking it from their own inventory, I was able to get the lights to update properly. I've tested all items that used /pickup and they all worked correctly, apart from tray which never worked correctly as I then tested it on the online servers. I'll create an issue report for that later.

-The crew monitor will now detect mobs that are inside a content of an object, such as a locker. I also made it so that it only detected mobs on the same z level as the computer itself, so people on the away missions and what not will not be able to see the crew member's on the station.

-Updated the changelog about my last commit, before this one.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4999 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-03 12:35:22 +00:00
Hawk-v3
cd641c3370 Merge pull request #1861 from AterIgnis/detonators
Detonators
2012-11-03 04:31:16 -07:00
Chinsky
d56b400b0c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-03 12:03:46 +04:00
giacomand@gmail.com
9294b283b6 -Added WJohnston's new laser-proof armour sprite.
-Reduced queen healing rate to 5. The increased max health should be enough.
-Aliens can clear hatched eggs by clicking on it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4998 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-03 07:39:10 +00:00
Chinsky
4e6a77edb4 Stopped cig butts falling out of mouths. 2012-11-03 10:37:30 +04:00
headswe
cafd51e1a8 Merge pull request #1862 from Ravensdale/master
(Adjusted)Adjusts items emergency lockers spawn with, AI-less borgs spawn with NT not asmimov laws
2012-11-02 10:13:12 -07:00
giacomand@gmail.com
82820524f5 -Vent crawling mobs will trigger the area's Enter, which will fix turrets not targeting mobs vent crawling into the AI chamber/upload.
-Fixed turrets shooting over mobs, when they're lying down.
-Monkey boxes will now contain 5 monkeys.
-Decreased the amount of EMP grenades to the initial 5.

-Added several more symptoms.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4993 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-02 13:34:32 +00:00
giacomand@gmail.com
d46775ec87 -Aliens now take x2 as much damage from fire based weaponary, instead of x1.5.
-Doors are now weaker than walls; so normal weapons can destroy them much more easily.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4990 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-02 02:31:16 +00:00
giacomand@gmail.com
bd67128dac -More work to advance diseases.
The Pandemic should be more compatible with advance diseases. Currently it's pretty ugly but when I get rid of the broken diseases and convert the rest to advance diseases I will clean up the pandemic.

Vaccines will now work properly with advance diseases.

Soon I'll add a system so that you are able to name your own diseases, as I've added ways for me to do that with the archive_diseases list.

Gave names to symptoms for the Pandemic.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4989 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-01 23:59:27 +00:00
Ravensdale
19bca3e2ef Update code/game/objects/structures/crates_lockers/closets/utility_closets.dm 2012-11-01 15:43:09 -07:00
Ater Ignis
cbc31b9090 Adjustable timer for default grenades 2012-11-01 21:05:02 +04:00
Ater Ignis
e79df68ef3 added new assembled timer-igniter assembly and added that to default chem-grenades 2012-11-01 17:49:21 +04:00
Chinsky
f9a42f4ba9 ...debug print. 2012-11-01 00:31:36 +04:00
Chinsky
d2bf021e7d Cleaned up walllocker code.
Emergency lockers are ready to be used.
2012-10-31 02:00:39 +04:00
Chinsky
7e1e1872b2 Readded robolimbs and amputated limbs drawing properly.
Now character gets proper robo and amputated limbs on spawn.
Readded checks for amputated hands.
2012-10-30 07:59:54 +04:00
Chinsky
2d216bf746 Fixed bug with unpickable cig butts.
And just generally got rid of unneeded vars.
2012-10-30 06:25:32 +04:00
Ravensdale
ce7e72c367 Fixes what emergency lockers spawn with so masks aren't rarer than diamonds. 2012-10-29 17:11:54 -07:00
Chinsky
964e28df42 Fixed runtie in cig code. 2012-10-30 01:34:53 +04:00
Chinsky
5281cbf2e2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-29 04:28:32 +04:00
Chinsky
27eaaa01d1 Ported virus2 system and machinery.
Viruses2 do not spawn anywhere yet, until machinery is on map.
2012-10-29 04:27:58 +04:00
headswe
9fda27f6a9 Merge pull request #1820 from Spamcat/master
Alt satchels, adjustable masks, ashtrays.
2012-10-28 02:33:19 -07:00
headswe
5c9ab3c6d3 Merge pull request #1836 from AterIgnis/detonators
Detonators assembly
2012-10-28 02:32:19 -07:00
Ater Ignis
72f3c70da9 primed grenades must not be disassembable easy 2012-10-28 11:20:42 +04:00
elly1989@rocketmail.com
4d9876fd65 Fixes issues with pen bbcode. Replacetext did not work correctly after I changed text2list - (It was missing 'needles' at the beginning of 'haystacks').
>dd_replacetext and dd_replacetext_case are now replacetext and replacetextEx respectively.
>replacetext and replacetextEx works using strings only; it doesn't convert it into a list and then back into a string.

Fixes some dumb-dumbs in textlist and text2listEx
> "<" where there should be a "<="
> no else case for when the separator is longer than the text (causing empty lists to be returned)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4971 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 21:21:17 +00:00
petethegoat@gmail.com
6af0e6ab84 Committing Lisa. God help me if this causes any corgi erp.
Also adding comfy chairs and office chairs to the metal recipes list.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4970 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 18:33:36 +00:00
petethegoat@gmail.com
ce8d8be416 Made mousetraps an assembly.
The path has changed from /obj/item/weapon/mousetrap to /obj/item/device/assembly/mousetrap
Deleted mousetraps.dm, and removed the original define from weapon.dm

Added a new /obj/item proc, on_found(). It's called when pockets are emptied, and whenever someone looks in a storage item. Currently used only by mousetraps and facehuggers~

Updated the map with path changes.
Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4969 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 16:39:52 +00:00
Ater Ignis
2acba34e11 fix of names in grenade 2012-10-27 19:48:48 +04:00
petethegoat@gmail.com
bc933cc10b Fixes issue 1040. Ability to give mechs all access and remove DNA locks from mechs and more.
(the fix is shitty, but then, so is mech code)
Fixes issue 1043. Safe structure allows users to teleport any item in the game to them

Increases the firefighter heat resistance to 4500.
Removes firefighter.dm, as it was entirely commented out. Firefighters are in ripley.dm.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4968 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 14:51:30 +00:00
giacomand@gmail.com
9dd84554de -Runtime fix for the "in_use" var.
-Forgot to give membrane extra health. I'll be planning on adding health to resin doors soon.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4964 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 00:57:51 +00:00
Spamcat
665c840da3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-26 23:57:05 +04:00
Ater Ignis
d17f1adfab ED-209 is a security bot, but not Beepski, do not check for ED being Beepski and 'bang' - it appears on security pda as expected 2012-10-26 15:51:36 +04:00
Ater Ignis
156320eb3c people suffocating in lockers and bodybags maybe cool, but suffocating in healing sleeper or dna modifier - bad, let's revert that back? 2012-10-26 13:17:04 +04:00
giacomand@gmail.com
6a2d78bc94 -Killed the updateDialog lag. I added a check to see if there were any mobs to update, if not it will stop checking until a user uses the machine again. I had to replace all the machine = src and machine = null with procs to help make it manageable. I believe this is one of the culprits causing the server to lag as the round goes on, as more players will interact with machines.
-Atmos delay is now based on active players, to help fight lag for massive player rounds.

-Changed some for(blah in world) loops to use the correct lists.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4958 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-25 19:15:51 +00:00
Ater Ignis
6337048aad updated grenades, now with remote control, proximity control and timer control for your choosing 2012-10-25 19:56:32 +04:00
giacomand@gmail.com
bbd693f86d -Metroid eggs are now a child of eggs. Meaning you can throw them at people!
-Resin walls/windows will now block heat the same as regular walls.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4955 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-25 03:07:08 +00:00
Chinsky
236780d8c6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-25 03:42:20 +04:00
Chinsky
9d34691b82 Added holsters and bunny slippers.
Holsters work a bit different from before.
They utilize system for clipping things on uniform.
So now holster can be worn on any clothing.
Also it can now hold any handgun(or what I assumed to be handgun).
2012-10-25 02:00:48 +04:00
giacomand@gmail.com
a6b214cc06 -Monkeys will now start dying when in crit.
-Fire heals Metroids now!
-Improved corrosive acid.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4952 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-24 20:24:48 +00:00
giacomand@gmail.com
28a04fbb9d -Aliens can acid turf. The only turf they cannot acid are r_walls. I just used a typecheck because I didn't see the need for types of turf needing to be unacidable, but if so I'll make a variable for it.
-Made a proc which will select active candidates.

BALANCE STUFF

-Acid is less random.
-Humans being disarmed by Aliens is no longer a random duration, instead it is a constant 10, instead of the random 10 to 15.
-Facehugger throw range was reduced to 5.
-Laying eggs costs 75 plasma (from 50) and secreting resin costs 75 plasma (from 100).
-Reduced stun duration of Alien disarm to Cyborgs. From 10 to 7.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4949 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-24 16:39:46 +00:00
elly1989@rocketmail.com
7b720a20b6 >Moved most of the helper procs into code/__HELPERS. If you see ANYTHING generic enough to be a helper proc just throw it in there and help purge the copypasta 5ever
>Replaced dd_text2list, dd_text2listcase, tg_text2listcase and tg_text2list with text2list and text2listEx. text2list will return a list of each and every character in the string if you set separator=""
>added return_file_text(filepath) which returns text from a file after doing some checks: does the file exist? is the file empty? It prints helpful error messages to the world.log if it runs into problems
>Replaced dd_file2list(filepath, seperator) with file2list(filepath, seperator). It just calls text2list(return_file_text(filepath), seperator). rather than copypasta
>Replaced time_stamp() so it's not as retarded
>Lots of the world setup stuff uses file2list now, rather than file2text -> sanity -> text2list
>Added error() warning() testing() procs. These print messages to world.log with a prefix. e.g. ## ERROR: msg.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4948 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-24 14:39:36 +00:00
Spamcat
23960a8064 Cigarette quickfix. 2012-10-23 23:58:11 +04:00
headswe
0d98248b6f Merge pull request #1821 from comma/master
Pain & Other Ported Things
2012-10-23 08:47:30 -07:00
petethegoat@gmail.com
cbfaa81771 Fixed up grilles a bit. They're still kinda bad, but eh.
Fixed a few mistakes from r4936.
Added static.dmi for Giacom.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4942 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-23 14:23:46 +00:00
Spamcat
7183a7c3d3 Merge https://github.com/Baystation12/Baystation12 2012-10-23 17:56:00 +04:00
Spamcat
512daeeee7 Ported ashtrays, cigs don't produce cigbutt obj when they are put down.
Added ashtrays to every breakroom.
2012-10-22 21:41:56 +04:00
Chinsky
b46c887469 Ported implants.
Compressed matter implant.
Death alarm implant.
Made explosive implant work like pre-merge: trigger on code phrase instead of host's death.
2012-10-22 17:52:27 +04:00