Commit Graph

8886 Commits

Author SHA1 Message Date
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
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
59beeab301 Adjustable masks. 2012-10-21 23:23:08 +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
4fd1322dcf Made clown planet coords card not working. 2012-10-21 19:59:36 +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
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
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
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
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
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
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
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
Cael_Aislinn
0f3f008ff6 mergefixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-21 02:22:06 +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
aranclanos@hotmail.com
7bbf30c800 Fixes issue 1007. Changed the throwforce of the holodeck energy swords from 5(!) to 0.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4921 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-20 14:39:11 +00: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
headswe
4a7c435748 Merge pull request #1802 from comma/master
Runtime
2012-10-20 06:21:50 -07: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
66a250ec58 -Fixed Issue 1021 - Rather simple solution but it's a shame I have to do it this way.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4918 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-20 03:46:11 +00: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
ba32520ca2 -Forgot to remove a debug message.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4916 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-20 02:23:26 +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
926036a660 Fixed a few more problems with RP revolution and anti revolution.
Heads now get the chance to resign.
RP rev convert verb now is in the IC tab
2012-10-19 11:28:52 -07:00
cib
c4d4f1950e Fixed an error in the anti-revolution objective description. 2012-10-19 11:08:07 -07:00
cib
4046b80829 Corrupt heads should now be displayed in antagonist panel. 2012-10-19 10:59:01 -07:00
cib
0849907dae Fixed another bug with anti-revolution. 2012-10-19 10:35:54 -07:00
cib
ce76e802f1 Fixed a small bug with anti-revolution. 2012-10-19 10:33:54 -07:00
cib
bf3e910a12 Merge branch 'master' of github.com:CIB/Baystation12 2012-10-19 10:17:02 -07:00
cib
bf83e5c3ba Added a new mode: anti-revolution 2012-10-19 10:00:54 -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
cib
172c974111 Changed the announcement for RP revolution. 2012-10-19 08:59:33 -07:00