Commit Graph

9304 Commits

Author SHA1 Message Date
ZomgPonies
05507b6ce6 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-24 06:48:40 -04:00
Mloc-Argent
69d9d9fc49 atmos: make fires more destructive
Fires can now burn through walls, windows, and (with a high enough
 temperature) rwalls.
New proc: adjacent_fire_act().  Called on turfs that a fire isn't able
 to spread to. (walls, floor surrounded by windows, etc.)

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

Conflicts:
	code/game/objects/structures/window.dm
2014-06-24 06:48:08 -04:00
Mloc-Argent
511d695fad turf: adds a damage model for walls
New proc for walls: take_damage().
Damage is tracked in the "damage" var, walls will break if "damage"
 hits "damage_cap".
Damage can be repaired with a weldingtool.
Damage overlays are cached in the global wall var "damage_overlays"
 to reduce overhead.

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

Conflicts:
	code/game/turfs/simulated/walls.dm
	icons/turf/walls.dmi
2014-06-24 06:43:41 -04:00
Hubblenaut
b66631e360 Moves the non-implanted security positions from restricted to protected list, adds IA Agent to restricted.
Conflicts:
	code/game/gamemodes/cult/cult.dm
	code/game/gamemodes/revolution/revolution.dm
2014-06-24 06:36:15 -04:00
Necaladun
9f0d9dc491 Access for Embassies
Embassy ID locks - 120-127
2014-06-24 12:57:11 +09:30
Necaladun
9b5bb0c1dc Area tags for embassies
Area tags and fugly images
2014-06-24 12:01:05 +09:30
mwerezak
7e057e7eb9 Minor shuttle fixes and cleanup
Readds the missing "shuttle has left the station" message, improves the
ETA calculation and reorganizes the procs in shuttle_controller.dm
2014-06-23 11:10:28 -04:00
mwerezak
d8c02c7b6e Some fixes
Conflicts:
	code/game/supplyshuttle.dm
2014-06-23 11:09:14 -04:00
mwerezak
9874ce38ce shuttle_controller now uses a shuttle datum
Conflicts:
	code/game/machinery/computer/communications.dm
	code/modules/admin/verbs/randomverbs.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/power/singularity/singularity.dm
2014-06-23 11:07:58 -04:00
mwerezak
55532e51a0 Supply controller now holds a ref to it's shuttle
Instead of having to look it up every time.

Conflicts:
	code/game/supplyshuttle.dm
2014-06-23 10:33:05 -04:00
DJSnapshot
35506b404f allows laptops to be recharged in rechargers.
Conflicts:
	code/game/machinery/recharger.dm
2014-06-23 06:22:41 -04:00
ZomgPonies
b8c1dbf620 Preparing repo for overhauled computer3 2014-06-23 05:52:00 -04:00
ZomgPonies
096cae4dd4 Hopefully cut down on ressource size and speed up loading 2014-06-23 04:29:22 -04:00
ZomgPonies
de5faa1a6a Legless people can drag themselves onto chairs,bed,wheelchairs now. 2014-06-22 15:07:03 -04:00
Bone White
0bebf0d357 Mecha DNA fix
Fixes the invalid DNA error on mechs after dna locks.
2014-06-22 17:09:23 +01:00
Zuhayr
38559ab477 Makes forks usable.
Conflicts:
	code/game/objects/items/weapons/kitchen.dm
	icons/obj/kitchen.dmi
2014-06-22 10:58:50 -04:00
Chinsky
7bdc096ee1 Optimizes crew console scanning to only look for mobs instead of ALL clothing items in the world. 2014-06-22 06:29:02 -04:00
ZomgPonies
d2129f5a01 Revert "optimize crew monitor's scan()"
This reverts commit 8e245f527db4a00088fc2b7b8576fadc11875a6a.

Conflicts:
	code/__HELPERS/global_lists.dm
	code/modules/clothing/clothing.dm
2014-06-22 06:28:41 -04:00
mwerezak
b64441cb26 Fixes FEA temperature_expose() being used...
...instead of ZAS fire_act().

Conflicts:
	code/game/gamemodes/blob/theblob.dm
	code/game/machinery/doors/airlock.dm
	code/game/objects/structures/window.dm
	code/game/turfs/simulated/walls_mineral.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/reagents/reagent_dispenser.dm
2014-06-22 02:03:42 -04:00
ZomgPonies
f83fa70684 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-22 01:49:56 -04:00
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
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
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
Necaladun
e138a3526f Combat knife
Added combat knife
2014-06-22 04:23:18 +09:30
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
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
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
alex-gh
c187ed88c7 Deduplicating code 2014-06-21 07:36:19 +02:00
ZomgPonies
0320b1a32e Fueltank explosions go to attack log 2014-06-20 16:26:27 -04: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
dedd110700 Send more stuff to attack log rather than admin log. 2014-06-20 13:42:42 -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
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
3fa03af4cb Changes paint tile coloring to use color var, less icon procs. 2014-06-20 12:07:34 -04:00
ZomgPonies
53ac0c4c79 Merge pull request #267 from Bone-White/master
Vox clone scanner and NO_SCAN fix
2014-06-20 10:00:42 -04:00
Bone White
61578a5880 Vox able to be cloned fix (2)
Minor syntax fix
2014-06-20 14:10:40 +01:00