Commit Graph

9456 Commits

Author SHA1 Message Date
Chinsky
683e4f304a Fix for detective revolver.
Turns out my previous fix did not help. Problem was in detective ammo having wrong caliber.
2012-10-30 03:07:51 +04:00
Chinsky
6f1852449d Ported custom items system. 2012-10-30 02:27:51 +04:00
Chinsky
964e28df42 Fixed runtie in cig code. 2012-10-30 01:34:53 +04:00
Mloc
6d350c6529 Merge pull request #1850 from comma/master
Virus2 and small fixes.
2012-10-29 12:29:48 -07:00
baloh.matevz
0a2a9362fe - Added a speach_probability variable to parrots, which starts out at 10. It decreases over time, meaning that while it's speach chance is initially prob(10) in each life cycle, as soon as it succeeds, it will be prob(9) and so on, until it eventually gets to prob(1). In effect this reduces the amount of Poly spam.
- Increased the time between vending machine adverts from 60s to 600s = 10 minutes. In addition, I set it so a newly created vending machine assigns a random time for it's first message to be displayed to ensure that all vending machines don't say their message at the same time.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4981 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-29 19:14:51 +00:00
sieve32@gmail.com
1990d911ee Added the 'says','exclaims','asks' filter to the 'Me' emote as well
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4980 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-29 17:10:35 +00:00
sieve32@gmail.com
6639c6e2cf - Added on to most emotes so anyone 'miming' will perform silent versions of them, so mimes can now use all of the pre-existing emotes and they won't have their vows forcibly broken by diseases making them yawn or whatnot.
Fixes Issue 1039
- Made the custom emote proc discard any emotes that start with "says", "asks", or "exclaims", to prevent people from impersonating others via emotes.
Fixes Issue 1020
- Made the ticker call mob/living/Death() for all mobs that are currently alive on z1 for nuked station cinematics (No matter what triggered the nuke, the station being destroyed will kill everyone and make them shut up)
Fixes Issue 1048
- Added a confirmation message to regenerative stasis for changelings, so that if they are not dead or unconscious a pop-up will ask them to confirm faking death.
Fixes Issue 1014 

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4979 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-29 16:40:57 +00:00
headswe
36953f7eab Merge pull request #1837 from AterIgnis/dismemberment
Dismemberments
2012-10-29 04:11:28 -07:00
Ater Ignis
fa1d74e435 added comments 2012-10-29 15:04:30 +04:00
Ater Ignis
6666e0cc3e fixed i=5 crutch
I accept, that was really silly
2012-10-29 14:35:50 +04:00
Chinsky
513e4463c5 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/modules/clothing/spacesuits/rig.dm
2012-10-29 07:23:19 +04:00
Chinsky
165ec69cfa Return of the moderator. 2012-10-29 07:12:02 +04:00
Hawk_v3
23801464cf Merge remote-tracking branch 'upstream/master'
Conflict resolved:
	code/modules/clothing/spacesuits/rig.dm
2012-10-29 01:29:47 +00:00
giacomand@gmail.com
6a2947d511 -Alien embryos will revert to stage 2 if it finds no candidates and the host has no client, meaning no more brain dead larva.
-Alien embryos take longer to burst.
-Alien embryos have more of a chance of curing, also added another fun cure.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4978 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-29 01:01:56 +00:00
Chinsky
95d5912c2d Readds missing wizard rigsuit. 2012-10-29 04:54:57 +04:00
Chinsky
5281cbf2e2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-29 04:28:32 +04:00
Chinsky
27eaaa01d1 Ported virus2 system and machinery.
Viruses2 do not spawn anywhere yet, until machinery is on map.
2012-10-29 04:27:58 +04:00
Hawk_v3
9185b5189c RIGs have heat resist.
Firesuits have cold resist.

You're welcome. ^v^
2012-10-28 23:39:50 +00:00
sieve32@gmail.com
a3d01da585 - Made Mech RCDs drain power when decontructing shit instead of recharging, both for consistency and the fact that it was pretty dumb.
- Changed Energy Relays so that they no longer offset equipment drain to APCs while charging from them (Essentially infinite power for the most part), buffed the charge rate so it will compensate for a Ripley's movement as a benchmark.
- Updated tgstation.2.0.9.dmm to remove a stray pipe that was sitting on the arrival shuttle, even though it was being deleted at round-start

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4977 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-28 22:04:38 +00:00
sieve32@gmail.com
1879167cd4 - Made Mimewalls a seperate instance of forcefields instead of the special-snowflake-mime-dependent ones. When made, they are added to processing_objects, and count down every process() until they delete themselves(And are removed from processing_objects)
Fixes Issue 1025
- Made the Nuke Disk delete itself under certain conditions when it hits a transition tile in space, specifically if it is inside a bag and NOT on a living mob's back with a client, so spaced containers, backpack on braindead body, backpack on corpse will no longer make Nuclear Emergency unwinnable.
Fixes Issue 1026
- Added parse_zone() to projectile/Bump(), so instead of being hit in the "r_leg" you would be hit in the "right leg", and so on.
Fixes Issue 1028
- Touched up my throw logging so that instead of doing a search through the player_list to match stuff up, it simply pulls the client from carn's directory list

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4976 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-28 18:40:52 +00:00
giacomand@gmail.com
8112a568b1 -Remove Aliens having DNA, this way they cannot mutate into humans.
-Removed mob/Login giving the mob DNA, it should be done in the appropriate mob login procs.
-Changed how facehuggers decide to attach when being taken out of the pocket by someone stripping.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4975 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-28 18:28:57 +00:00
Ater Ignis
f4f3beeacb that must be a bit more correct, i think 2012-10-28 21:52:09 +04:00
Cael_Aislinn
10034cdac4 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Conflicts:
	code/modules/clothing/suits/suit_cramp.dm
	code/modules/mob/living/carbon/human/inventory.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-29 02:19:28 +10:00
baloh.matevz
14fa60a125 - You can now set your character's age up to 85 (used to be 45) in the character setup menu.
- Added a few helper procs that change someone's skin tone to a descriptive word and someone's age to a descriptive word. This will be used in a human examine verb update.
- Completely remapped Medbay for 3.0.0. 

Discussion thread for medbay remap:
http://www.nanotrasen.com/phpBB3/viewtopic.php?f=15&t=10677

Screenshots of medbay remap:
http://www.kamletos.si/medbay%203.0.0%206.png (normal lighting)
http://www.kamletos.si/medbay%203.0.0%206%20nodark.png (no darkness)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4974 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-28 16:10:34 +00:00
Hawk-v3
299c8d6433 Merge pull request #1848 from Hawk-v3/master
Cryo edit. No More Alien Race Damage.
2012-10-28 03:31:39 -07:00
Hawk_v3
b64a1cfe69 Fixed a unused area in Cryo.
Removed damaging effects to alien players. C'mon, we whitelist them already!
2012-10-28 10:28:12 +00:00
headswe
9fda27f6a9 Merge pull request #1820 from Spamcat/master
Alt satchels, adjustable masks, ashtrays.
2012-10-28 02:33:19 -07:00
headswe
5c9ab3c6d3 Merge pull request #1836 from AterIgnis/detonators
Detonators assembly
2012-10-28 02:32:19 -07:00
Ater Ignis
72f3c70da9 primed grenades must not be disassembable easy 2012-10-28 11:20:42 +04:00
Hawk_v3
fe6ed49062 Atmospheric Pressure Suits 2012-10-28 07:11:51 +00:00
Hawk_v3
8e877047d9 Reverted Suit Cramping
Hawk_v3
2012-10-28 07:01:02 +00:00
Hawk-v3
59021935a0 Merge pull request #1843 from CIB/master
Removed duplicate folder and fix to cryo
2012-10-27 23:44:24 -07:00
Cael_Aislinn
12a677cf0b increased cramp interval, removed damage chance
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-28 15:43:55 +10:00
Ater Ignis
547635a0c4 raise default range value of proximity sensor from 1 to 2 2012-10-28 08:37:03 +04:00
Kortgstation@gmail.com
66232b87ae Removed the chance to fail a grab upgrade. Since choke was nerfed, this isn't really needed anymore, and just serves to be annoying.
Replaced all the for viewer in range stuff that was in the grab file with visible_message

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4973 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-28 02:29:27 +00:00
Cael_Aislinn
b88aaea336 halved species-unfitting damage, made cramp damage actually stick to max 10 + lowered accum rate
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-28 10:30:39 +10:00
elly1989@rocketmail.com
4d9876fd65 Fixes issues with pen bbcode. Replacetext did not work correctly after I changed text2list - (It was missing 'needles' at the beginning of 'haystacks').
>dd_replacetext and dd_replacetext_case are now replacetext and replacetextEx respectively.
>replacetext and replacetextEx works using strings only; it doesn't convert it into a list and then back into a string.

Fixes some dumb-dumbs in textlist and text2listEx
> "<" where there should be a "<="
> no else case for when the separator is longer than the text (causing empty lists to be returned)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4971 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 21:21:17 +00:00
petethegoat@gmail.com
6af0e6ab84 Committing Lisa. God help me if this causes any corgi erp.
Also adding comfy chairs and office chairs to the metal recipes list.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4970 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 18:33:36 +00:00
headswe
dcfdd23ef0 Merge pull request #1838 from AterIgnis/antisuffocate
Anti-suffocate
2012-10-27 10:03:41 -07:00
petethegoat@gmail.com
ce8d8be416 Made mousetraps an assembly.
The path has changed from /obj/item/weapon/mousetrap to /obj/item/device/assembly/mousetrap
Deleted mousetraps.dm, and removed the original define from weapon.dm

Added a new /obj/item proc, on_found(). It's called when pockets are emptied, and whenever someone looks in a storage item. Currently used only by mousetraps and facehuggers~

Updated the map with path changes.
Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4969 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 16:39:52 +00:00
Ater Ignis
2acba34e11 fix of names in grenade 2012-10-27 19:48:48 +04:00
Ater Ignis
61e16ee87f updated code to more readable 2012-10-27 19:29:48 +04:00
petethegoat@gmail.com
bc933cc10b Fixes issue 1040. Ability to give mechs all access and remove DNA locks from mechs and more.
(the fix is shitty, but then, so is mech code)
Fixes issue 1043. Safe structure allows users to teleport any item in the game to them

Increases the firefighter heat resistance to 4500.
Removes firefighter.dm, as it was entirely commented out. Firefighters are in ripley.dm.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4968 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 14:51:30 +00:00
Cael_Aislinn
5b5153ee37 some tweaks to fire - it consumes fuel faster, and properly goes out after a while, hopefully fix for 1 * 10e-99 burning fuel bug
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-27 23:39:17 +10:00
Cael_Aislinn
d38670f75a heavy suits cause cramps over time (minor brute damage at intervals of a few minutes), also made species clothing incompatabilities actually affect the relevant body parts
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-27 23:16:12 +10:00
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
Cael_Aislinn
0e279a3e34 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 2012-10-27 20:44:54 +10:00
cib
b6e662a2e9 Cryo now just makes the air vanish, instead of overpressurizing medbay. 2012-10-27 12:39:21 +02:00
cib
7bf03bc920 Removed redundant code/modules/detectivework 2012-10-27 12:10:59 +02:00
Cael_Aislinn
e8b44dca13 made away missions actually load properly, also added a command report / admin report when they become active. made all away missions except wizard academy possible destinations
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-27 19:59:05 +10:00