Commit Graph

3920 Commits

Author SHA1 Message Date
Zuhayr
4da65639b8 Drones now have plasma cutters instead of emags. 2014-06-24 12:11:52 -04:00
Zuhayr
ea2395b848 Fixes #5323 2014-06-24 12:11:04 -04:00
Zuhayr
519f3397d3 Added extra bit of info to drone spawn.
Conflicts:
	code/modules/mob/living/silicon/robot/drone/drone.dm
2014-06-24 12:10:38 -04:00
Zuhayr
a2fde000b6 Removed ability for drones to talk on Binary.
Conflicts:
	code/modules/mob/living/silicon/robot/drone/drone.dm
2014-06-24 12:04:31 -04:00
Chinsky
d1932f7045 Moved same code into single organ helper to handle embedding.
Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/organs/organ_external.dm
2014-06-24 11:46:56 -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
ZomgPonies
506bd94252 This should allow people to hear the lobby jukebox 2014-06-23 05:33:40 -04:00
mwerezak
cbaaba0d9c Fixes #5193 2014-06-23 04:35:53 -04:00
ZomgPonies
096cae4dd4 Hopefully cut down on ressource size and speed up loading 2014-06-23 04:29:22 -04: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
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
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
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
0f94b0d415 Wont be deaf if you die unconscious/knocked out. 2014-06-21 16:45:32 -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
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
mwerezak
bc260b5c89 Fixes #5299 2014-06-21 05:52:52 -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
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
ZomgPonies
7f7462e577 Runtime fixes, try to fix speech breaking? 2014-06-20 10:33:00 -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
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
alex-gh
c98c3ce909 Melee runtime fix
Fixes "positional parameters must precede all named args" runtime.
2014-06-20 01:35:47 +02:00
ZomgPonies
3f0f5b0327 Fun removal commitee was unanimous 2014-06-19 17:51:51 -04:00
ZomgPonies
1bf4d485a4 Derp 2014-06-19 16:53:15 -04:00
ZomgPonies
9700a8e54b Fart sound. 2014-06-19 16:37:59 -04:00
Necaladun
bef546bb7b 3rd times the charm - trinary
Changed to :5 because :t was conflicting with something to do with
radio?
2014-06-20 04:15:15 +09:30
mwerezak
6b692feff0 Armour can turn sharp attacks into blunt ones
Kind of messy, but I couldn't find another way to do it without
reworking a lot of the mob defence procs.
2014-06-19 09:40:04 -04:00
mwerezak
6e7139087e Fixes human/checkarmor getting the armour...
...value for the wrong body part.

Whoever put ran_zone() in there wasn't thinking straight, as it's not
going to affect the part that actually gets damaged.
2014-06-19 09:39:44 -04:00
mwerezak
a06850450a Fixes tails not rendering on the player preview 2014-06-18 22:17:29 -04:00
Boop
93d7f057e0 Fix runtime with brains and throwmode
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
2014-06-18 22:14:44 -04:00
Necaladun
187f56d996 Kidan language fix
Kidan language to :4 instead of :l to avoid radio chat
2014-06-18 21:50:07 +09:30
Regen
7de8683435 Gave nightvision to Aliens and Shadow people 2014-06-18 14:01:55 +02:00
ZomgPonies
37e975fcc8 Merge pull request #261 from Bone-White/master
Pickpocket Gloves fix
2014-06-18 06:34:37 -04:00
Bone White
89b8a002bf Pickpocket Gloves fix
They can now take/place ids without notifying, and ids enter the
pickpocket's hand instead of dropping to the floor or not working.
2014-06-18 11:04:33 +01:00
Necaladun
4340ba620d Fixing a derp
trinary should be t
2014-06-18 18:43:01 +09:30
Necaladun
7fec1c561c MP Language
Trinary for MP
2014-06-18 12:18:36 +09:30
alex-gh
845edf79d5 Added E-N emagging 2014-06-18 01:38:48 +02:00
ZomgPonies
1132879810 Fixed up the stupid handcuff shit that's been bugging me forever. 2014-06-17 10:26:04 -04:00
mwerezak
71af102747 Fixes armour being applied to projectiles twice 2014-06-17 07:11:08 -04:00
mwerezak
f4fcb7dcff Fixes apply_damage ignoring species mods
Also adds some adjust*Loss type procs for adjusting the damage on
specific body parts. apply_damage() should be the standard way to deal
damage to a mob, though.
2014-06-17 07:10:57 -04:00
mwerezak
f280f8a510 Adds thrown object sharp and edge flags 2014-06-17 07:10:46 -04:00
unknown
331239e726 Adds diona unarmed attack type 2014-06-17 07:10:33 -04:00