Commit Graph

7567 Commits

Author SHA1 Message Date
Loganbacca
6225adf42f Preview icon render fix
- Fixes #5254
- Changes organ render list to a structured list so we can control the render order
2014-06-22 01:49:44 -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
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
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
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
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
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
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
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
alex-gh
538e18acb2 Fixed missing bracket 2014-06-20 21:27:51 +02:00
ZomgPonies
7805a61dab Made Admin Log only show up to senior admins (+SERVER) 2014-06-20 13:50:24 -04:00
mwerezak
b39abf59fa Spaceacillin cures infected organs 2014-06-20 12:18:19 -04:00
mwerezak
02572867e4 Tweaks wound infection a bit
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
2014-06-20 12:17:51 -04:00
mwerezak
ba08210cd7 Re-enables organ infections, adds wound infection
Conflicts:
	code/game/atoms.dm
	code/modules/mob/living/carbon/carbon.dm
	code/setup.dm
2014-06-20 12:14:19 -04:00
mwerezak
6d44eea078 Updates l_move_time to use world.time 2014-06-20 12:12:31 -04:00
Chinsky
e14c19f457 Changed color mixing to use weighted average instead of addition. Should help against values reaching FF too fast.
Adjusted color mixing helper to use inbuilt procs.
2014-06-20 12:08:30 -04:00
Chinsky
fc76ac01e0 Nextgen lighting #2: Lights
Can paint light tubes and bulbs with paint and stick in sockets to get colored lights.
2014-06-20 12:07:46 -04:00
Chinsky
5a85ac8c9f Nextgen lights #1: supermatter
Now it glows with yellowish tint, getting brighter as damage level rise.

Conflicts:
	code/modules/supermatter/supermatter.dm
2014-06-20 12:07:11 -04:00
ZomgPonies
7f7462e577 Runtime fixes, try to fix speech breaking? 2014-06-20 10:33:00 -04:00
ZomgPonies
2b0d586281 Made it so if a bug report or question comes in and there's noone with the right flag on, it gets sent to anyone with r_admin instead. 2014-06-20 09:50:48 -04:00
Loganbacca
a72d2824dc New vehicle loading code
Conflicts:
	code/modules/mob/mob.dm
	code/modules/mob/mob_movement.dm
2014-06-20 09:01:00 -04:00
Loganbacca
4924324dbf Potential new sprite 2014-06-20 08:51:49 -04:00
Cael Aislinn
5e02cedf46 switched autocloner and replicator artifacts over to a timer system, made replicator use materials to create items (materials can be anything)
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2014-06-20 08:48:31 -04:00
Cael Aislinn
c23cb7afef rework talking items and re-enable them, made xenoarch boxes have a variable internal size, added three new eldritch xenoarch finds (poltergeist mask, vampiric statuette, endless replenishing container)
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>

Conflicts:
	code/modules/research/xenoarchaeology/finds/finds_defines.dm
2014-06-20 08:47:51 -04:00
Cael Aislinn
dbce0f457f harvester can now harvest artifact's secondary effect, which effect it chooses is determined by which are active (if both are active it can harvest neither)
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2014-06-20 08:17:01 -04:00
Cael Aislinn
18d5053e5b miscellaneous fixes to various anomaly utiliser effects involving location/holder issues, fixed anomaly harvester runtime, reworks anomaly utiliser to be a lot easier/nicer to use, balance tweaks:
- caps stun effect values for pulsing
- sets max utiliser battery charge to 300 (30 sec)
- changes energy consumption for utiliser pulse effects to "effect max charge level" * "effect range" ^ 2
- changes energy consumption for utiliser touch effects to 100 (10 sec worth of consumption)

Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2014-06-20 08:16:40 -04:00
Cael Aislinn
2082789543 moved xenoarchaeology master controller code into a separate file
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>

Conflicts:
	code/modules/research/xenoarchaeology/misc.dm
2014-06-20 08:16:30 -04:00