Markolie 61daab92f2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ...

# Conflicts:
#	code/modules/mob/living/carbon/human/appearance.dm

2016-10-25 18:31:39 +02:00

..

admin

Part three: The Hierophant. Also minor fixes for the other bosses.

2016-10-24 21:39:40 +02:00

alarm

…

arcade

type-check instead of variable check

2016-09-28 18:57:43 -04:00

assembly

Topic UID finishing touches

2016-09-08 13:07:14 -04:00

atmos_automation

UID mass replace: src=\ref[datum]

2016-09-05 23:12:08 -04:00

awaymissions

Legion fixes, debug controller additions, turret fix

2016-10-24 03:04:37 +02:00

client

Merge pull request #5416 from KasparoVy/tail_markings_mark2

2016-10-23 19:29:54 -04:00

clothing

bottlefix

2016-09-18 01:06:47 -04:00

computer3

Fix up a number of ID checks

2016-10-23 15:49:02 +02:00

countdown

Cloning Update

2016-08-31 01:48:02 -04:00

crafting

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

customitems

Merge pull request #5416 from KasparoVy/tail_markings_mark2

2016-10-23 19:29:54 -04:00

detective_work

…

economy

Fix aliens double attacking, tank examining and ATM security level 0 interaction

2016-10-21 17:21:23 +02:00

error_handler

Integrates UIDs into View Variables

2016-09-08 19:04:50 -04:00

events

Lay groundwork for megafauna, and add Ashdragon.

2016-10-23 23:15:57 +02:00

examine

…

ext_scripts

…

fish

…

flufftext

makes it work

2016-10-02 00:48:31 +02:00

food_and_drinks

Add Colossus, add outdoors variable to areas and update fireball targeting

2016-10-25 04:10:52 +02:00

garbage_collection

…

holiday

…

hydroponics

bottlefix

2016-09-18 01:06:47 -04:00

karma

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

library

Topic UID finishing touches

2016-09-08 13:07:14 -04:00

lighting

…

logic

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

martial_arts

add_logs() un-fuckery

2016-08-29 17:27:56 -04:00

mining

Fix spells, shadow/Diona QoL improvements (HUD icons)

2016-10-25 18:11:09 +02:00

mob

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

2016-10-25 18:31:39 +02:00

nano

Conflict resolution.

2016-09-26 12:17:35 -04:00

ninja

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

paperwork

Merge pull request #5642 from Krausus/UniqueIDs

2016-09-12 15:32:20 -04:00

pda

UID mass replace: src=\ref[datum]

2016-09-05 23:12:08 -04:00

persistence

…

pooling

Lay groundwork for megafauna, and add Ashdragon.

2016-10-23 23:15:57 +02:00

power

Lay groundwork for megafauna, and add Ashdragon.

2016-10-23 23:15:57 +02:00

procedural_mapping

…

projectiles

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

2016-10-25 18:31:39 +02:00

reagents

Merge pull request #5755 from Fox-McCloud/loading-fixes

2016-10-10 20:18:24 -04:00

recycling

Pressure limit on disposal units

2016-10-22 20:51:49 +02:00

research

Merge pull request #5644 from GeneralChaos81/Conveyors

2016-10-11 20:27:46 -04:00

ruins

…

scripting

…

security_levels

Fix up a number of ID checks

2016-10-23 15:49:02 +02:00

shuttle

UID mass replace: src=\ref[datum]

2016-09-05 23:12:08 -04:00

space_management

…

spacepods

Fix space pod ion damage

2016-10-11 20:41:46 +02:00

store

…

surgery

Fixes 2 Bugs with PR #5416

2016-10-23 23:14:53 -04:00

telesci

Added Bubblegum. Added dismemberment chance to bullets, and made changes to GPS tracking.

2016-10-25 00:50:31 +02:00

tooltip

…

tram

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

vehicle

Lay groundwork for megafauna, and add Ashdragon.

2016-10-23 23:15:57 +02:00