Akke 12206ae324 Merge branch 'nukeopsrenovation' of https://github.com/LanCartwright/-tg-station into nukeopsrenovation ...

# Conflicts:
#	code/game/objects/items/weapons/storage/backpack.dm

2015-12-20 21:02:08 +00:00

..

admin

Merge pull request #13761 from KorPhaeron/prayers

2015-12-19 11:48:11 -06:00

assembly

…

awaymissions

Merge pull request #13571 from KorPhaeron/gate_destruction

2015-12-18 00:23:23 -03:00

client

Corrects invalid button in Prefs

2015-12-18 20:12:57 +00:00

clothing

adds so much more shit

2015-12-20 20:59:23 +00:00

crafting

fixes honkworthy oversight

2015-12-12 15:38:40 -05:00

detectivework

…

emoji

…

events

Merge pull request #13582 from Incoming5643/Ill_turn_this_game_into_a_shitty_F2P_korean_MMO_yet

2015-12-13 15:04:53 -06:00

flufftext

…

food&drinks

Merge branch 'master' of https://github.com/tgstation/-tg-station into lizcannotwag

2015-12-17 20:12:32 -05:00

games

Begin rewrite of NanoUI frontend.

2015-12-15 13:07:11 -06:00

holiday

…

holodeck

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

html_interface

Prefix everything with 'nanoui' to avoid conflicts

2015-12-15 13:12:33 -06:00

hydroponics

Merge pull request #13608 from KorPhaeron/fire_defines

2015-12-14 10:44:10 -06:00

json

Make NanoUI resistant to Topic spoofs

2015-12-15 22:37:52 -06:00

library

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

lighting

forgot a line

2015-12-16 03:29:24 -08:00

mining

Line ending apocalypse

2015-12-17 14:12:37 +13:00

mob

Merge pull request #13659 from bgobandit/beepskyfunremoval

2015-12-19 02:49:33 -03:00

nano

Re-organize NanoUI procs

2015-12-17 10:18:00 -06:00

ninja

Refactors ntick proc, fixes ninja suit not draining energy

2015-12-09 20:28:43 +04:00

paperwork

Line ending apocalypse

2015-12-17 14:12:37 +13:00

power

Merge pull request #13728 from KorPhaeron/burning_singulo

2015-12-18 03:49:55 -03:00

procedural mapping

Adds two CA mapGenerators

2015-12-17 11:45:27 +01:00

projectiles

Update projectile.dm

2015-12-19 22:56:10 +00:00

reagents

Darkens lexorin jelly slightly, brightens ripping tendrils slightly.

2015-12-18 13:32:31 -05:00

recycling

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

research

I think I fixed this

2015-12-16 23:14:14 +02:00

security levels

Renames IsAGhost to IsAdminGhost.

2015-12-06 20:21:43 -08:00

shuttle

Line ending apocalypse

2015-12-17 14:12:37 +13:00

space transition

…

surgery

Merge branch 'master' of https://github.com/tgstation/-tg-station into lizcannotwag

2015-12-17 20:12:32 -05:00

telesci

…

tooltip

…