Commit Graph

8886 Commits

Author SHA1 Message Date
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
Cael_Aislinn
1d1c907bfb made fire extinguishers not freeze everything
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-27 19:20:51 +10:00
Kortgstation@gmail.com
f7ab60f359 Communications consoles will only work on Z1 (on SS13). No more cultists holding the server hostage forever from their space fort. Not fun for anyone but them.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4966 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 05:04:19 +00:00
sieve32@gmail.com
45a2d6cb64 - Made throwing log and factor armor. The attack_log (Both server and mob) will show who last touched the object as the 'assailant', even if they didn't directly hit them.
Fixes Issue 1033

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4965 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 01:04:58 +00:00
giacomand@gmail.com
9dd84554de -Runtime fix for the "in_use" var.
-Forgot to give membrane extra health. I'll be planning on adding health to resin doors soon.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4964 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 00:57:51 +00:00
petethegoat@gmail.com
861a036941 Added medical and security record filing cabinets.
Added a pig mask.

Changes to the map:
Added a safe to the vault, and a stethoscope on the nuke shuttle.
Added a camera and hand labeler to art storage.
Added a medical cabinet to the Detective's office.

Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4962 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-26 23:29:34 +00:00
giacomand@gmail.com
88bca2f4b8 -Forgot to take out a debug message.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4961 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-26 22:23:54 +00:00
giacomand@gmail.com
d5d2bce78e -Fixed an issue with PDA messaging not working.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4960 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-26 21:27:14 +00:00
Spamcat
665c840da3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-26 23:57:05 +04:00
Ater Ignis
d17f1adfab ED-209 is a security bot, but not Beepski, do not check for ED being Beepski and 'bang' - it appears on security pda as expected 2012-10-26 15:51:36 +04:00
Ater Ignis
156320eb3c people suffocating in lockers and bodybags maybe cool, but suffocating in healing sleeper or dna modifier - bad, let's revert that back? 2012-10-26 13:17:04 +04: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
Spamcat
609c75fe58 Matches can be put in ashtrays as well. 2012-10-25 23:37:32 +04:00
giacomand@gmail.com
6a2d78bc94 -Killed the updateDialog lag. I added a check to see if there were any mobs to update, if not it will stop checking until a user uses the machine again. I had to replace all the machine = src and machine = null with procs to help make it manageable. I believe this is one of the culprits causing the server to lag as the round goes on, as more players will interact with machines.
-Atmos delay is now based on active players, to help fight lag for massive player rounds.

-Changed some for(blah in world) loops to use the correct lists.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4958 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-25 19:15:51 +00:00
petethegoat@gmail.com
2063c3715d Added Flashkirby's new hair styles- http://baystation12.net/forums/viewtopic.php?f=44&t=5395.
Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4957 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-25 19:11:13 +00:00
Ater Ignis
55c553f535 1) show dismemberments on player: erase limbs which are ORGAN_DESTROYED
2) if player is husk - still try to overlay robotic limbs if they are present, but not anything else
3) human without legs can't stay, right? but he can crawl if there exist any part of arm or leg - only fully delimbed body can't move
2012-10-25 20:00:44 +04:00
Ater Ignis
6337048aad updated grenades, now with remote control, proximity control and timer control for your choosing 2012-10-25 19:56:32 +04: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