Commit Graph

4108 Commits

Author SHA1 Message Date
cib
c11b765d2c Increased cost of cryo.
- It now uses twice as much oxygen
- Cryoxadone and clonexadone now heal brute, burn and oxyloss much slower, though cloneloss remains at the same speed.
2012-10-27 12:45:42 +02:00
cib
7bf03bc920 Removed redundant code/modules/detectivework 2012-10-27 12:10:59 +02:00
Hawk-v3
a8d5e9e019 Merge pull request #1830 from theMIj/master
Xenoarch: artifacts, strange rocks, pretty orebox
2012-10-26 01:44:49 -07:00
Hawk-v3
98365e5996 Merge pull request #1832 from comma/master
Holsters and bunny slippers.
2012-10-25 15:30:48 -07:00
Mij
e63277ee04 Fixed my ore box mistakes
Keeps strange rocks out of ore boxes. Actually changes sprites in the
correct place. >.>
2012-10-25 08:48:25 -07:00
Chinsky
9716049b4e Fixed derp. 2012-10-25 17:53:59 +04:00
Chinsky
eb72f2d48e Fixed couple of holster messages typos.
Reworked way isHolster() works.
Fixed bug with detecive revolver, making it impossible to reload.
2012-10-25 16:32:57 +04: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
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
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
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
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
headswe
0d98248b6f Merge pull request #1821 from comma/master
Pain & Other Ported Things
2012-10-23 08:47:30 -07:00
Chinsky
27e8b7ea50 Readded autocapitlizing said messages. 2012-10-23 12:36:26 +04: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
Chinsky
91b61f91e7 Readded pain and shock system.
Tramadol and oxycodone are back too.
2012-10-22 06:38:57 +04: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
giacomand@gmail.com
0f88f133fb Commiting for Numbers:
* Flour produce should be accurate now producing a whole lot now
* Added multipliers to grinder nutriment transformation functionality. Any negative number is treated as a multiplier now -1.5 would turn x nutriments into 1.5x products etc.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4932 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-21 21:40:16 +00: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
Kortgstation@gmail.com
af2efc53e6 Artillery control now displays how long until the gun is reloaded.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4929 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-21 07:54:17 +00:00
Kortgstation@gmail.com
863ce4826a The booze vendor on the beach map starts emagged so you don't need to be a bartender to use it.
Deleted an extra airlock in the spacebattle map, made the kitchen/bathroom nicer

Fixed the lighting in the gateway room on the station map

Gave the melee syndies nopush so you can't just dash through mobs of them forever. They're slightly faster as well (though still slower than a maxspeed human).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4928 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-21 06:01:31 +00:00
baloh.matevz
0f767e5cae - Added a small correction to the permissions panel code. It will now save ckey(s) where s is the key you insert for the new admin. This was an oversight on my part. Until the server is updated past this revision, just insert the ckey when prompted, same as you would into admins.txt.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4927 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-21 02:22:56 +00:00
Chinsky
52f9c0c9dc Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-21 05:52:18 +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
johnsonmt88@gmail.com
6c3686aa96 Allows admins to 'animalize' a player into a parrot
Added in a message for player-parrots trying to use the 'sit' verb when no perch is in range.

Removed the 'Warning, this is unfinished!' message when trying to spawn parrots.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4925 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-21 01:16:36 +00:00
johnsonmt88@gmail.com
e99c70722f Bears, syndicate, carp and clowns no longer search every atom in a 7x7 area twice every life.dm() while idling.
Removed SA_search() as it was pointless.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4924 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-20 23:18:05 +00:00
johnsonmt88@gmail.com
e478bb6c25 Parrots now move more than once per tick, with exception of them wandering. This means they can actually catch up to mobs they're trying to steal from!
Parrots will fly away faster after being shot.

The parrot's flying sprite is now a little faster.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4923 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-20 20:38:54 +00:00
Chinsky
085f5f7fe1 Added ability to rig fueltanks
To make your very own ghetto explosive:
1.Wrench faucet open on tank.
2.Add assembly of your choice (only timers and radios work as triggers here)
To unmake it simply remove assembly with hands and wrench faucet back.

Rigging tank with igniter logs for admins.

Also explosion size depends on amount of fuel left in tank.
2012-10-20 22:31:13 +04:00
Chinsky
21a19d46cb Fixed typo, now slur should properly fade away. 2012-10-20 22:05:57 +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
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
98cfaff0b8 Holodeck weapons no longer harm simple animals.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4920 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-20 14:16:24 +00:00
Cael_Aislinn
3fe88c4fef mergefixes, misc
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-21 00:11:01 +10:00
aranclanos@hotmail.com
6ff45ca10f Fixes issue 1005. Bears, Carps, Clown NPCs and syndicate NPCs will now attack mechs. Only if the mech has a driver.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4919 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-20 13:12:54 +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
giacomand@gmail.com
1e1f173ca2 -Added large Nar-Sie. It is summoned by Cultists instead of regular Nar-Sie.
-Larger icon provided by HornyGranny.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4914 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-19 20:38:53 +00:00
cib
4046b80829 Corrupt heads should now be displayed in antagonist panel. 2012-10-19 10:59:01 -07:00
giacomand@gmail.com
092bb7b056 -Sanitized brain messages which they talk through their radio enabled MMI.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4912 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-19 16:38:11 +00:00
Chinsky
f6bcb421d4 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-18 21:35:13 +04:00
Chinsky
5f7c9d5518 Readded welder fuel.
Fixed issue with fire not generating light.
Fixed pre-merge issue with fuel passing through closed airlocks.
2012-10-18 21:25:24 +04:00
Mloc
af8ab15ebf Merge pull request #1795 from CIB/master
Various fixes
2012-10-18 10:18:03 -07:00