GunHog 8a592b4f39 MERGE CONFLICTS SUCK ...

Stupid Bolas

2016-02-29 11:28:49 -06:00

..

admin

Merge pull request #15795 from Menshin/forcefield_cleaning

2016-02-28 23:17:58 -03:00

assembly

Action buttons will now only update when needed instead of every Life().

2016-02-22 00:34:59 +01:00

atmospherics

Merge pull request #15497 from AnturK/scrub

2016-02-14 17:13:05 -03:00

awaymissions

Merge pull request #15708 from KorPhaeron/sins

2016-02-26 08:46:32 -06:00

cargo

Merge pull request #15809 from bgobandit/bettercontraband

2016-02-28 23:13:55 -03:00

client

Merge pull request #15642 from AnturK/random_things

2016-02-21 10:21:13 -03:00

clothing

Merge pull request #15775 from AnturK/fix1

2016-02-27 21:27:08 -03:00

crafting

adds bolas

2016-02-26 17:59:55 -08:00

detectivework

Get the code running on 510

2016-02-04 17:19:40 -06:00

emoji

Fixes emoji issues to do with adminPM and OOC formatting

2016-01-31 12:57:43 -05:00

events

Merge pull request #15728 from ChangelingRain/earlyblob

2016-02-26 13:23:21 -06:00

flufftext

temp

2016-02-20 22:12:25 -08:00

food&drinks

Makes the gibber give skins when gibbing humans. Also adds craftable human suits from human skin.

2016-02-11 09:59:23 +02:00

games

…

holiday

Fixes most (non hardsuit) helmets hiding the glasses when they shouldn't.

2016-02-14 00:03:07 +01:00

holodeck

Splits beds and chairs

2016-02-18 17:55:38 +01:00

html_interface

…

hydroponics

Merge pull request #15745 from KazeEspada/TreeCutting

2016-02-26 08:40:29 -06:00

jobs

Bag tweaks.

2016-02-16 14:03:35 -07:00

library

Sanitizes a bunch of num inputs to be integers

2016-02-21 12:15:37 -03:00

lighting

…

mining

Hardsuit Jetpack Upgrade

2016-02-28 18:37:27 -06:00

mob

Merge pull request #15707 from Core0verload/breathing_implant

2016-02-29 14:53:42 +11:00

ninja

temp

2016-02-20 22:12:25 -08:00

paperwork

Merge pull request #15775 from AnturK/fix1

2016-02-27 21:27:08 -03:00

power

* Cleaning field generator code

2016-02-27 22:44:17 +01:00

procedural mapping

Splits beds and chairs

2016-02-18 17:55:38 +01:00

projectiles

Merge pull request #15707 from Core0verload/breathing_implant

2016-02-29 14:53:42 +11:00

reagents

lighten color

2016-02-27 22:07:30 -05:00

recycling

Fixes revive() not properly removing the blind overlay. (fixes staff of healing)

2016-02-14 15:26:46 +01:00

research

Adds breathing tube implant, changes how heart works, reworks arm-mounted implants

2016-02-25 12:50:45 +03:00

ruins

Adjacency checks

2016-02-24 13:20:12 -06:00

security levels

Rename get_ui_data -> ui_data, remove useless shuffle from wires

2016-02-05 17:09:40 -06:00

shuttle

Address feedback

2016-02-08 07:22:18 -06:00

space transition

…

spells

Merge pull request #15429 from Fox-McCloud/gibbing-organs

2016-02-26 21:34:26 -06:00

surgery

Merge pull request #15707 from Core0verload/breathing_implant

2016-02-29 14:53:42 +11:00

telesci

…

tgui

Rename get_ui_data -> ui_data, remove useless shuffle from wires

2016-02-05 17:09:40 -06:00

tooltip

…

uplink

Merge pull request #15793 from ChangelingRain/steelpunted

2016-02-28 13:23:54 -06:00

vehicles

Switches to overlay/temp

2016-02-25 13:11:08 +01:00