TechnoAlchemist d434ac96f4 Merge branch 'master' of https://github.com/tgstation/tgstation into alchemy_pt_1 ...

# Conflicts:
#	code/game/objects/items/weapons/storage/bags.dm
#	code/modules/mining/lavaland/ash_flora.dm

2016-10-10 13:20:25 -07:00

..

admin

Merge pull request #20873 from MrStonedOne/hubadubdub

2016-10-10 16:00:18 -04:00

assembly

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

atmospherics

Replaces yet more istypes with helpers (#20806)

2016-10-10 17:48:35 +13:00

awaymissions

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

cargo

Adds gas canister crates to cargo (#20555)

2016-09-18 19:07:55 -05:00

chatter

…

client

More istypes replaced with helpers (#20767)

2016-10-03 13:40:13 +13:00

clothing

Updates prescription glasses and hipster glasses onmob sprites, removes green glasses (#20807)

2016-10-10 18:33:07 +13:00

countdown

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

crafting

Replaces yet more istypes with helpers (#20806)

2016-10-10 17:48:35 +13:00

detectivework

…

emoji

…

events

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

flufftext

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

food_and_drinks

Merge branch 'master' of https://github.com/tgstation/tgstation into alchemy_pt_1

2016-10-10 13:20:25 -07:00

games

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

holiday

Adds a few turf istype helpers (#20754)

2016-10-01 19:25:46 +02:00

holodeck

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

html_interface

…

hydroponics

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

jobs

More istypes replaced with helpers (#20767)

2016-10-03 13:40:13 +13:00

library

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

lighting

…

mining

Merge branch 'master' of https://github.com/tgstation/tgstation into alchemy_pt_1

2016-10-10 13:20:25 -07:00

mob

Replaces yet more istypes with helpers (#20806)

2016-10-10 17:48:35 +13:00

modular_computers

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

ninja

Makes the pronoun helper proc names less horrifyingly long (#20780)

2016-10-10 12:28:25 +13:00

orbit

Orbits are now a subsystem (#20632)

2016-09-24 19:52:49 +12:00

paperwork

Makes the pronoun helper proc names less horrifyingly long (#20780)

2016-10-10 12:28:25 +13:00

power

Replaces yet more istypes with helpers (#20806)

2016-10-10 17:48:35 +13:00

procedural_mapping

Adds a few turf istype helpers (#20754)

2016-10-01 19:25:46 +02:00

projectiles

Replaces yet more istypes with helpers (#20806)

2016-10-10 17:48:35 +13:00

reagents

Merge branch 'master' of https://github.com/tgstation/tgstation into alchemy_pt_1

2016-10-10 13:20:25 -07:00

recycling

Replaces yet more istypes with helpers (#20806)

2016-10-10 17:48:35 +13:00

research

Makes the pronoun helper proc names less horrifyingly long (#20780)

2016-10-10 12:28:25 +13:00

ruins

Makes the pronoun helper proc names less horrifyingly long (#20780)

2016-10-10 12:28:25 +13:00

security_levels

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

shuttle

Makes the pronoun helper proc names less horrifyingly long (#20780)

2016-10-10 12:28:25 +13:00

space_transition

…

spells

Replaces yet more istypes with helpers (#20806)

2016-10-10 17:48:35 +13:00

station_goals

Adds a few turf istype helpers (#20754)

2016-10-01 19:25:46 +02:00

stock_market

Properly brackets the conditionals for if

2016-10-05 13:46:14 +03:00

surgery

Makes the pronoun helper proc names less horrifyingly long (#20780)

2016-10-10 12:28:25 +13:00

telesci

…

tgui

More istypes replaced with helpers (#20767)

2016-10-03 13:40:13 +13:00

tooltip

…

uplink

Intensifies the secret satchel system so people will actually use it.

2016-09-25 21:28:56 -04:00

vehicles

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

VR

…

zombie

Makes the pronoun helper proc names less horrifyingly long (#20780)

2016-10-10 12:28:25 +13:00