Commit Graph

2511 Commits

Author SHA1 Message Date
Chinsky
5d62b98c18 Added 50% chance of thrown baton to stun mob 2012-11-05 14:46:00 +04:00
SkyMarshal
70c2fb231d Fixed Security HUD issues, reinstated old grenade behavior, de-nerfed Polyacid 2012-11-04 16:17:35 -07:00
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
Hawk-v3
cd641c3370 Merge pull request #1861 from AterIgnis/detonators
Detonators
2012-11-03 04:31:16 -07:00
Chinsky
4e6a77edb4 Stopped cig butts falling out of mouths. 2012-11-03 10:37:30 +04: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
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
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
2d216bf746 Fixed bug with unpickable cig butts.
And just generally got rid of unneeded vars.
2012-10-30 06:25:32 +04:00
Chinsky
964e28df42 Fixed runtie in cig code. 2012-10-30 01:34:53 +04:00
headswe
9fda27f6a9 Merge pull request #1820 from Spamcat/master
Alt satchels, adjustable masks, ashtrays.
2012-10-28 02:33: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
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
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
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
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
Cael_Aislinn
c0e7ad00b2 merge fixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-22 20:25:27 +10:00
Cael_Aislinn
dd538fd3c5 Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport
Conflicts:
	code/game/gamemodes/events.dm
	code/game/gamemodes/wizard/veilrender.dm
	code/game/jobs/job/captain.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/life.dm
	code/setup.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-22 20:15:05 +10:00
Cael_Aislinn
9340f70252 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Conflicts:
	icons/obj/items.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-22 19:35:03 +10:00
Chinsky
ad7cd0ed58 ID biometry.
Bloodtype, DNA and fignerprint are back to ID
2012-10-22 00:41:43 +04:00
Chinsky
5e4273c919 Fixed runtime in secure briefcase code. 2012-10-21 17:58:54 +04:00
Chinsky
7ae59ba6f7 Slapped a few nullchecks near reported runtimes. 2012-10-21 16:41:44 +04:00
giacomand@gmail.com
6616314ca6 -Cleaned up Simple Animals by having a hostile class which will handle standard attacking, then the childs of that class can override the procs to do something different, if needed.
-Cameras won't shock you anymore, when cutting the power wire.
-Cultists cannot be gibbed by placing more runes that is allowed, instead it says no and to clear any unused runes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4926 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-21 01:31:41 +00:00
d_h2005@yahoo.com
15c4b01c9f -Monkeys can now wear luchador and sexy clown masks, among others.
-Wood chairs are actually constructable now.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4922 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-20 19:17:21 +00:00
Chinsky
179c510547 Makes briefcase start without paper.
All jobs that start with it have plenty of places to get paper.
2012-10-20 22:50:01 +04:00
Cael_Aislinn
01d3e3bf79 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Conflicts:
	code/datums/disease.dm
	code/modules/reagents/Chemistry-Reagents.dm
	icons/turf/areas.dmi
	maps/tgstation.2.0.9.1.dmm

yep, this time going to merge map updates before making map changes >.>

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-21 01:25:04 +10:00
Cael_Aislinn
2a07ba0f6e mergefixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-21 01:04:37 +10:00
Cael_Aislinn
2f853fe23a Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/devices/radio/radio.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/mob/living/say.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/paperwork/paperbin.dm
	html/changelog.html
	icons/turf/areas.dmi
	maps/RandomZLevels/assistantChamber.dmm
	maps/RandomZLevels/fileList.txt

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-21 00:25:05 +10:00
aranclanos@hotmail.com
e4bcc80405 git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4917 316c924e-a436-60f5-8080-3fe189b3f50e 2012-10-20 02:51:12 +00:00
giacomand@gmail.com
28fbd01e7f -Added a new, and admin spawnable only, machine which can turn humans into Cyborgs. Probably can be used for Robot Uprising events. The human has to be lying down and alive to be Borged. When spawned a conveyor belt will spawn on the left and right side too.
-Reduced the duration of the flare. I think putting it in process() made it last longer.

-Added some null checks in camera chunks.

-Large NarSie now force calls the shuttle and displays a threatening warning message.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4915 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-20 02:13:40 +00:00
Chinsky
5513280add Fixed runtime in C4 code 2012-10-19 14:31:54 +04:00
Chinsky
16e6f178a4 Buffed fuel tank explosions. 2012-10-18 15:40:55 +04:00
Chinsky
886119787d Arrivals computer fixed forever. 2012-10-18 10:09:39 +04:00
Asanadas
0ba466e881 Removing Soghun stutters, fix for infinite BoH in BoH. 2012-10-17 19:18:17 -04:00
cib
a1aa3ddecf Ported limb selection. 2012-10-17 20:08:34 +02:00