Commit Graph

9304 Commits

Author SHA1 Message Date
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
Hawk-v3 98365e5996 Merge pull request #1832 from comma/master
Holsters and bunny slippers.
2012-10-25 15:30:48 -07: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
Cael_Aislinn 96813cac8e another partial fix
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-25 21:30:26 +10:00
Cael_Aislinn b35fc75a33 partial antiqua compile fix
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-25 21:23:40 +10:00
Cael_Aislinn d3f77398a6 decreased blob expand rate from 3 seconds to 7 seconds
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-25 20:39:00 +10: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
giacomand@gmail.com 00ad0b6c2a -Removed a duplicated bullet_act.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4954 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-24 22:09:52 +00: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 dd8d1f6ac2 -You can now target non-dense objects with a projectile.
-Added bullet_acts for computers, canisters and windoors.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4953 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-24 21:56:00 +00: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
elly1989@rocketmail.com b1fdee2e32 Changed some global_list stuff:
>tried to make the comments less confusing.
>Removed the procs for rebuilding the lists (they weren't meant to be used and half were broken anyway).
>added a directory. It maps ckey to client like so directory[ckey] = client. It could be used for PMs, banning, and various other admin tools rather than using \ref[]
>var/list/admins is now a list of clients whom are admins.
>var/list/admin_datums is what var/list/admins used to be. A map from ckey -> admin datum
Most of this is so I can add modular admin ranks in a non-horrendous way and fix some existing issues.
>var/list/client_list is now var/list/clients (laziness sorry)
>removed some needless loops and stuff.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4951 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-24 20:11:39 +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
Cael_Aislinn 7aee209637 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 2012-10-25 00:35:19 +10:00
Cael_Aislinn a9431fcecf removed immovable rod from occurring, removed space dust, doubled time between events
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-24 23:06:41 +10: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
sieve32@gmail.com 38e4b2e059 -Bad indentation on my part led to an issue with a billion plasma airlocks spawning when lit.
Fixes Issue 1032

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4937 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-23 00:18:03 +00:00
headswe 903464af45 Merge pull request #1774 from jediluke69/master
fixes for maintance access
2012-10-22 17:07:31 -07:00
Kortgstation@gmail.com a713ab64a2 More visible_message stuff. This is terrible.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4936 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-22 23:40:02 +00: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
jediluke69 650064daaf Update code/game/jobs/access.dm 2012-10-22 14:41:25 -03:00
Spamcat 2cea1ecf7e Merge https://github.com/Baystation12/Baystation12 2012-10-22 17:55:05 +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
giacomand@gmail.com 6f7c26629d -Changed xeno to have a safe way to hatch eggs with plasma.
http://imgur.com/80LJx

-Added a turf meter which shows the air contents of a tile.
-Added a simple vent controller for the dual vents.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4935 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-22 05:41:00 +00:00
Kortgstation@gmail.com 068fc7afda Replaced a ton more for viewer in range things with visible_message
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4934 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-22 04:30:19 +00:00
Kortgstation@gmail.com 20ddf29dae Syndicate simple animals will now attack windows/grilles/closets/tables they come into contact with so you can't cheat and tank with them.
Added an attackanimal to closets. Anything with wall_smash will be able to break them. This means Juggernauts can punch open closets now.

Replaced all the for mob in viewer shit with visible_message in OpTable.dm and table_racks.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4933 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-22 02:26:34 +00:00
Chinsky ad7cd0ed58 ID biometry.
Bloodtype, DNA and fignerprint are back to ID
2012-10-22 00:41:43 +04:00
Chinsky 4d9d407aa6 Added back tape rolls.
Two rolls in engie lockers because there are only tow lockers on map
2012-10-22 00:16:22 +04:00
Spamcat def7d83e0f Re-added alt satchels. 2012-10-21 23:21:40 +04:00
giacomand@gmail.com d5422f6a7e -Grilles can now be destroyed by fires.
-Added a define for the minimum amount of damage a mob takes from plasma.
-Increased it to 20, from 10.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4931 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-21 19:03:50 +00: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
Kortgstation@gmail.com 3a52f9b2b7 Added items to the crates on the space battle map. Added new areas for the various syndicate ships instead of all of them being Nanotrasen Cruiser.
Captain now spawns with an armoured vest on and his spacesuit spawns on the rack with his jetpack/helmet. This means the suit will exist even if a captain doesn't at round start.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4930 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-21 10:31:16 +00:00
Chinsky 52f9c0c9dc Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-21 05:52:18 +04:00
Chinsky 77d12b5e19 Added photos to security and medical records terminals.
Generated during record creation, smaller version of char setup preview code.
2012-10-21 05:45:36 +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 9f67811427 Merge remote-tracking branch 'remotes/git-svn' 4921 into bs12_with_tgport
Conflicts:
	code/game/machinery/computer/HolodeckControl.dm
	code/modules/mob/living/simple_animal/life.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-21 02:59:35 +10:00
Cael_Aislinn fbf3396e4c map compile fixes, added a surprise to the teleporter
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-21 02:51:30 +10:00