Commit Graph

17074 Commits

Author SHA1 Message Date
mwerezak
c67bd0a8e8 Less terrible sprite for suit cooling device
Also adds a few of them to EVA storage.

Conflicts:
	icons/obj/device.dmi
	maps/tgstation2.dmm
2014-06-22 01:46:45 -04:00
mwerezak
b474afb0b5 Fixes pressure and temperature damage for autopsies
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
2014-06-22 01:45:02 -04:00
Necaladun
3bfcaaec88 i'm still an idiot
fucked up more things...should work now :3

Cannot compile to properly test because of other errors that aren't mine
for once
2014-06-22 08:32:33 +09:30
Necaladun
55a61a67f3 negative hallucination amounts is bad
thanks UC. Negative hallucinations may result in people seeing too much
reality.
2014-06-22 08:17:34 +09:30
Necaladun
e17f2a0899 citalopram fix
Citalopram now functions as an antipsychotic, reducing hallucinations. 1
unit will counter 1u of mindbreaker, but not remove it - synaptazine for
that.
2014-06-22 08:12:41 +09:30
Necaladun
cd7f8f5738 Slight empathy change
Better wording for reading intent
2014-06-22 08:12:41 +09:30
Mloc-Argent
40b0ecf006 optimize crew monitor's scan()
New global list, "clothing_list".

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/__HELPERS/global_lists.dm
	code/modules/clothing/clothing.dm
2014-06-21 17:35:31 -04:00
mwerezak
1625d82487 IPCs actually take heat damage from temperature now
Also fixes the healthanalyzer still not scanning IPCs properly (scanning
them when it shouldn't)

Conflicts:
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/robot/component.dm
2014-06-21 17:31:59 -04:00
mwerezak
4dd8b16cac Having an infection raises your body temperature
Also the toxin damage taken during INFECTION_LEVEL_ONE is greatly
reduced.
Fixes robotic internal organs getting infections.
Fixes the organ_failure random event. Forgot to set the affected organ
as needing processing.
2014-06-21 17:25:00 -04:00
ZomgPonies
c41a608189 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-21 17:23:37 -04:00
mwerezak
c11e6ae106 Adds suit cooling device
Also:

Breathing in hot/cold air will affect your body temperature.
Fixes old body temperature stabilization code not working.
Thermometer icon now adjusts based on species.
Reduced BODYTEMP_AUTORECOVERY_MINIMUM to a less ridiculous value.

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/clothing/spacesuits/ninja.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mob/living/carbon/human/life.dm
2014-06-21 17:23:30 -04:00
ZomgPonies
3591dad3cb Merge pull request #272 from Jarcolr/patch-1
Fixes the Unathi/Shogun short frills
2014-06-21 17:05:40 -04:00
ZomgPonies
2fd3ad5802 NSS Cyberiad to NGS Cyberiad 2014-06-21 17:02:35 -04:00
ZomgPonies
0f94b0d415 Wont be deaf if you die unconscious/knocked out. 2014-06-21 16:45:32 -04:00
ZomgPonies
1f24f692ef Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-21 16:31:37 -04:00
ZomgPonies
f8c63eaa8c Made disable attack logs actually you know...work. 2014-06-21 16:31:09 -04:00
Necaladun
e138a3526f Combat knife
Added combat knife
2014-06-22 04:23:18 +09:30
Necaladun
3e4985351d added pockets
pockets to mercy robes
2014-06-22 04:10:24 +09:30
ZomgPonies
648302d3b7 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-21 14:25:29 -04:00
ZomgPonies
88e057868d Moar stuff for the attack logs 2014-06-21 14:25:11 -04:00
Necaladun
0878223871 Mercy Hood
fluff item
2014-06-22 03:23:19 +09:30
mwerezak
7f425ecf9b Cleans up train latching/unlatching
Also adds a verb for turning off train engines.

Conflicts:
	code/modules/vehicles/cargo_train.dm
	code/modules/vehicles/train.dm
2014-06-21 13:09:50 -04:00
ZomgPonies
7b4ef8f0f9 Compile fix 2014-06-21 13:03:27 -04:00
Chinsky
47327042eb Fixes #5264
Viruses are properly transferred to spilled blood now.
Antigens prevent from infection properly.
Lowered frequency of blood puddle virus check to cut down on processing.

Conflicts:
	code/game/turfs/simulated.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/organs/blood.dm
	code/modules/reagents/Chemistry-Reagents.dm
2014-06-21 13:02:11 -04:00
Chinsky
3ae1d2011f Fixes #5311 2014-06-21 12:57:03 -04:00
mwerezak
177137a4b5 Infections now spread between organs
Infections can now spread between internal and external organs.
Also changes the organ_failure random event to cause an infection
instead.

Conflicts:
	code/modules/events/organ_failure.dm
	code/modules/organs/organ.dm
2014-06-21 12:55:25 -04:00
mwerezak
2f9ba5d4b6 Cleans up organ processing
Conflicts:
	code/modules/organs/organ.dm
	code/modules/organs/organ_internal.dm
2014-06-21 12:48:39 -04:00
mwerezak
6e256506e3 Body temperature fixes and updates
Body temperature regulation is now based on species, and environmental
temperature now respects the air density when affecting living/humans.
This also fixes some bugs with heat/cold protection handling and
improves the way synthetic species body temperatures are handled to be
much more logical.

IPCs always gain temperature but cool down because of their environment.
When the heat transfer to the environment is reduced because of the lack
of air, this will cause IPCs to heat up.

As well, having an infection will increase your body temperature, and
body scanners now detect infections.

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/species.dm
2014-06-21 12:20:22 -04:00
mwerezak
9f4a338998 Body temperature damage now uses species values
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
2014-06-21 11:18:20 -04:00
ZomgPonies
62d7ab65b2 Explosions go to attack logs. 2014-06-21 07:27:31 -04:00
ZomgPonies
c6da7fdcdb Moar Event stuff 2014-06-21 07:12:55 -04:00
ZomgPonies
65785a2ee1 Move moar shit to Event tab 2014-06-21 06:55:15 -04:00
mwerezak
bc260b5c89 Fixes #5299 2014-06-21 05:52:52 -04:00
Jarcolr
ab90225226 Fixes #5283 and #5315
All it took was some fancy switches.

Conflicts:
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
2014-06-21 05:52:33 -04:00
ZomgPonies
768fb4a8bd Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-21 04:38:21 -04:00
ZomgPonies
fea9d8eda3 Switched verbs around, removed Fun tab, new Event tab for event coordinators 2014-06-21 04:37:50 -04:00
Jarcolr
4009f26b9a Fixes the Unathi/Shogun short frills
A s was missing from the icon_state.
2014-06-21 10:01:30 +03:00
alex-gh
67f77adb4d Merge pull request #271 from alex-gh/autotraitor_fix
Deduplicating code
2014-06-21 07:37:05 +02:00
alex-gh
c187ed88c7 Deduplicating code 2014-06-21 07:36:19 +02:00
alex-gh
d75d335f9b Goddamn phoron in my plasma 2014-06-21 07:31:05 +02:00
alex-gh
e78c90e163 Fixed supermatter runtime by updating the file to the latest BS12 version 2014-06-21 06:38:19 +02:00
alex-gh
94cb658c26 Merge pull request #268 from alex-gh/small_fixes
Fixed missing bracket
2014-06-21 05:49:51 +02:00
ZomgPonies
4f4a6a7ef8 NO SHOW ANTAGONIST 4 U 2014-06-20 16:31:35 -04:00
ZomgPonies
0320b1a32e Fueltank explosions go to attack log 2014-06-20 16:26:27 -04:00
alex-gh
538e18acb2 Fixed missing bracket 2014-06-20 21:27:51 +02:00
d3athrow
890d83a338 tweak flash invisibility removal length. 2014-06-20 14:35:52 -04:00
d3athrow
e4fb807a9d Forgot a few checks for leap 2014-06-20 14:34:56 -04:00
d3athrow
9e0e080376 Genetics tweaks and changelog.
Stealth is overtime instead of instantaneous
Cryokinesis is less OP, deals less damage to unclothed targets and respects hardsuits and internals.
Leap is nerfed, cooldown doubled as well as not being able to leap while restrained.

T-ray scanners and flashes will reveal 'invisible' mobs for a short period of time. this is a work in progress and possibly buggy!

Conflicts:
	html/changelog.html
2014-06-20 14:34:38 -04:00
ikarrus
7f4aaa6e44 New sound for forcing airlocks to open/close
sound/machines/airlockforced.ogg

Conflicts:
	code/game/machinery/doors/airlock.dm
2014-06-20 14:33:09 -04:00
ZomgPonies
7805a61dab Made Admin Log only show up to senior admins (+SERVER) 2014-06-20 13:50:24 -04:00