Commit Graph

2289 Commits

Author SHA1 Message Date
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
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
5bee6e1d24 ghosts have universal talk again
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-24 23:45:57 +10: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
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
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
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
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
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
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
giacomand@gmail.com
2f68d2cd48 -Brain radio MMIs were fixed, they wouldn't broadcast the MMI's message.
-Fixed a bug where you couldn't talk into intercoms while it is dark.
-AIs can now type in the "track with camera" verb and get a list of names to show up. This can save time if the AI needs to track an individual.
-Deleted the old AI move.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4910 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-18 16:16:29 +00:00
cib
01ba3871ca Fixed the bug where 'Show Own Skills' wouldn't work. 2012-10-18 15:33:46 +02:00
cib
d90944ad50 Several medical related changes.
- There's now internal wounds
- Appendicitis stage 4 causes internal wounds
- Added back the body scanner
2012-10-18 12:39:04 +02:00
Chinsky
92276c9887 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/modules/mob/new_player/new_player.dm
	html/changelog.html
2012-10-18 09:13:24 +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
cib
463178213c You can now pick opposite gender hairstyles. 2012-10-17 18:53:00 +02:00
Mloc
351a233f5f Arrivals runtime fix, thanks to Head!
Signed-off-by: Mloc <colmohici@gmail.com>
2012-10-17 16:07:19 +01:00
Chinsky
44934ef622 Removed my highly informative and professional debug print. 2012-10-17 14:33:53 +04:00
Chinsky
45e40c09c0 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-17 14:12:41 +04:00
Chinsky
357f42028e Forgot one hairstyle. 2012-10-17 13:50:47 +04:00
giacomand@gmail.com
3b95730028 -Committed RavingManiac (Smoke Carter)'s Roros laying eggs.
http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=10501
-You can insert the Auth Disk by clicking on the nuclear bomb.
-Changed how aliens are selected. It will filter the list of possible candidates by checking for players who aren't inactive for more than a minute. If no possible candidates are found, it increases the filter by another minute. It does this 5 times before giving up.
-Alien embryos cannot have carriers and they are more likely to infect someone.
-The time it takes before a larva bursts is increased a bit.




git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4897 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-17 06:04:25 +00:00
Chinsky
f0c4e3e965 Ported some of hairstyles. 2012-10-17 04:50:49 +04:00
Chinsky
0c97d77d77 Fixes issue with slurring never going away.
Ethylredoxrazine now properly fights alcohol effects.
2012-10-17 03:28:10 +04:00
Chinsky
fbc26fde61 Fixed Arrivals runtime. Does not fix issue of it not announcing arrival though. 2012-10-17 03:24:39 +04:00
giacomand@gmail.com
9e0d1ca164 -Added welding goggles, sprites by WJohnston. Aren't on the map yet as I'm waiting for it to be free.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4893 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-16 21:30:01 +00:00
cib
7fccadfc89 Ported AutoTraitor. 2012-10-16 18:44:53 +02:00
giacomand@gmail.com
964b86fdbd New Changeling Powers!
Hive Channel/Hive Absorb. Allows you to share your DNA with other changelings, very expensive chemical wise to absorb (download), not so much to channel (upload)! You cannot achieve your objective by sharing DNA.
Mimic Voice! You can form your voice of a name you enter. You won't look like them but when you talk, people will hear the name of who you selected. While you're mimicing, you can't regenerate chemicals.
Extract DNA! A power that allows you to silently sting someone and take their DNA! Meaning you do not have to absorb someone to become them. Extracting their DNA doesn't count towards completing your objectives.

Misc:

New livingmob proc GetVoice(), used by changeling mimicing and voice changers. Will return the name of the voice that should be heard by people.

Got rid of the chance to "feel" like someone isn't who they are.
Commented the check for someone's gender being incorrect in life. Looks like the bug hasn't re-occured since it was put in place.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4890 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-16 13:21:44 +00:00
DarkTechnomancer
981481ca56 Fixed nutrition-related messages showing up twice in the examine verb and ported pulling damage back in. 2012-10-16 00:10:40 -04:00
headswe
f296f9c3c8 Merge pull request #1761 from caelaislinn/bs12_with_tgport
misc merge things
2012-10-15 10:59:58 -07:00
headswe
3e94d7a682 Merge pull request #1768 from CIB/master
Bleeding fixes
2012-10-15 10:59:27 -07:00
Chinsky
468752ea6d Ported BS12 slur.
Sorta. Can't use html in said strings, so it will look a bit different.
2012-10-15 20:14:34 +04:00
Cael_Aislinn
548f60d25d Merge remote-tracking branch 'remotes/git-svn' r4881 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/game/gamemodes/events.dm
	code/game/machinery/doors/door.dm
	code/game/machinery/gateway.dm
	code/game/objects/items/devices/flashlight.dm
	code/game/sound.dm
	code/global.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/handlabeler.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paperbin.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/photocopier.dm
	code/modules/paperwork/stamps.dm
	code/world.dm
	html/changelog.html
	maps/RandomZLevels/fileList.txt

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-15 23:17:18 +10:00
cib
19846abebe Halved bleeding speed. 2012-10-15 15:13:49 +02:00
Cael_Aislinn
d38cf3da27 re-enabled alien player's hair and facial hair
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-15 21:43:40 +10:00