Commit Graph

8886 Commits

Author SHA1 Message Date
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
Cael_Aislinn
b7bc344d6e fixed an issue where mods could gain access to admin powers
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-25 20:31:00 +10:00
Cael_Aislinn
e8be4ac9f8 fixed kobolds (?) brought in supermatter and cleaned it up a bit
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-25 20:30:40 +10:00
giacomand@gmail.com
f7c8e01955 Throwing eggs will result in the reagents of the egg reacting to the target. (Which can be a turf, object or mob) This creates possibilities like chloral eggs, lube eggs, and many more.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4956 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-25 03:49:08 +00: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
Mij
4166ae3e3f Xenoarch: artifacts, strange rocks, pretty orebox
Artifacts and strange rock formations spawn during world gen. Frequency
may need tweaking.

Strange rocks melt when acid hits them due to what I assume are changes
/tg/ made with how acid works. Alternately I missed something during
copypasta spree. I'll muck with it later. For now, harvesting always
works with applied welding tools.

Ore boxes back to old beautiful selves. Re-added a few icons to
mining.dmi and the strange rock icon to turfs.dmi
2012-10-24 12:38:46 -07:00
giacomand@gmail.com
ca59c9fde9 -Hotfix: Can only acid simulated turf, as an Alien.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4950 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-24 16:46:27 +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
8d22166941 - tweaked lplasma spills and fire spawning - oxygen content is no longer counted towards % spawn chance.
- to spawn a turf fire (at default ignition level) atmos zones now require at least 17 moles of ignitable material (note that flamethrower fuel counts 15x more than other ignitables)

the relevant code seems weird and all over the place, but this seems to work in testing so i'm committing it for now

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-25 00:33:47 +10:00
Cael_Aislinn
5bee6e1d24 ghosts have universal talk again
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-24 23:45:57 +10:00
Cael_Aislinn
3ebb8b2173 remove random debug msg
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-24 23:25:24 +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
Mij
9be730245a Mij's first attempt at a commit. Please lemme know if this doesn't work.
Adds msay verb to admin observers and above, including admins and mods. Test successful on local build.
2012-10-23 21:14:17 -07:00
giacomand@gmail.com
92d0367c17 -Potentially fixed Metroids not going after food. They kept targeting unconscious food.
-Removed metroid core flushing. There doesn't seem to be a point of it.
-Badly made metroids unelectrutable. I'll change this later.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4947 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-24 02:23:17 +00:00
giacomand@gmail.com
2fe846065a -Added "give disease" VV dropdown option.
-You cannot spread diseases which are marked as SPECIAL or NON_CONTAGIOUS via blood injections.
-Carp no longer drift in space.
-Captain helmet now protects you from facehuggers.
-All humanoid aliens can now Regurgitate.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4946 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-24 00:29:27 +00:00
Spamcat
23960a8064 Cigarette quickfix. 2012-10-23 23:58:11 +04:00
headswe
13cb40b637 Merge pull request #1819 from Asanadas/master
Misc: commented out end-round sounds, the two tiniest // ever.
2012-10-23 08:47:50 -07: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
Cael_Aislinn
721dfeda57 removed old taj files
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-23 23:14:38 +10:00
Chinsky
8a27cfdb91 Reverted clown coords changes on Cael's request, he has something for that in his pull request. 2012-10-23 12:45:08 +04:00
Chinsky
27e8b7ea50 Readded autocapitlizing said messages. 2012-10-23 12:36:26 +04:00
elly1989@rocketmail.com
15c63e6bbf Added an instance counter to the status panel for admins. It just shows world.contents.len
It might be helpful in identifying stuff which isn't getting garbage collected properly.
u 
TODO: move those server stats onto another tab because they are kinda annoying if you actually want to play as an alium or something.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4940 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-23 04:58:24 +00:00
Asanadas
fca22627f9 Commented out end-round sounds, and banging donks. 2012-10-23 00:14:17 -04:00
johnsonmt88@gmail.com
cfe148550c Fixed a typo from my last commit.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4939 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-23 02:02:33 +00:00
johnsonmt88@gmail.com
c932037fba Parrots now pick up any item you can fit in your pocket (w_class <= 2)
Regular parrots now spawn with a random headset.

Fixed a typo in the regular parrot's description.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4938 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-23 01:43:04 +00: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
ecb74a32d2 fix for admins not being applied properly
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-22 19:57:50 +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