Kaedwuff c011b1d9b8 Fix for Bahama Lizard cocktail. (#4718) ...

I created some conflicting recipes accidentally with my lizard drinks.

This should fix the problem and allow Bahama Lizards to be made.

2018-05-15 10:15:56 +03:00

..

acting

…

admin

Load static lore news from the DB at the start of the round (#4618)

2018-04-29 22:47:30 +03:00

alarm

…

ambient_occlusion

Z-Lights Mk 2 (#4383)

2018-04-27 23:10:59 +03:00

antag_contest

…

assembly

Code Cleanup: (Bump(), Bumped()) -> (Collide(), CollidedWith()) (#4349)

2018-03-08 09:39:53 +02:00

awaymissions

Code Cleanup: (Bump(), Bumped()) -> (Collide(), CollidedWith()) (#4349)

2018-03-08 09:39:53 +02:00

blob

…

cargo

Merge branch 'master' into development

2018-05-13 19:19:52 +03:00

cciaa

Fixes #4463 (#4585)

2018-04-10 08:38:18 +03:00

client

Adds gruff cloak to loadout (#4721)

2018-05-15 10:15:23 +03:00

clothing

Merge branch 'master' into development

2018-05-13 19:19:52 +03:00

customitems

Custom items 08/05 (#4698)

2018-05-09 23:56:35 +03:00

detectivework

Mental Medication Overhaul, Smoking, and Breathing Reagents (#4220)

2018-03-25 21:51:27 +03:00

economy

Load static lore news from the DB at the start of the round (#4618)

2018-04-29 22:47:30 +03:00

effects

…

events

Load static lore news from the DB at the start of the round (#4618)

2018-04-29 22:47:30 +03:00

examine

…

ext_scripts

…

flufftext

list2text() -> jointext() (#4342)

2018-03-03 00:36:44 +02:00

food

This PR is the very definition of "They were right." (#4729)

2018-05-14 10:17:20 +03:00

games

…

genetics

…

ghosttrap

Turns imaginary friends into abstract mobs (#4358)

2018-03-10 17:22:25 +02:00

global_listener

…

holodeck

Refactors gravity checking (#4591)

2018-04-12 20:31:05 +03:00

http

…

hydroponics

Mental Medication Additions (#4648)

2018-05-13 17:39:56 +03:00

integrated_electronics

Integrated Electronics - GPS Tracker Z-Level (#4674)

2018-05-06 18:03:45 +03:00

intern

…

item_worth

Mental Medication Additions (#4648)

2018-05-13 17:39:56 +03:00

law

Security Fines (#4634)

2018-04-29 20:34:49 +03:00

library

…

lighting

Z-Lights Mk 2 (#4383)

2018-04-27 23:10:59 +03:00

liquid

…

maps

Let's stack the FSM that is the reader. (#4369)

2018-03-10 20:24:19 +02:00

martial_arts

Bug and map fixes for the april update (#4576)

2018-04-09 09:45:51 +03:00

materials

Fixes cardox recipe (#4417)

2018-03-15 12:43:52 +02:00

merchant

…

mining

Merge branch 'master' into development

2018-05-07 18:16:22 +03:00

mob

Bugfixes: resisting grab and synth version (#4712)

2018-05-14 00:39:32 +03:00

modular_computers

New cam networks (#4522)

2018-04-06 23:11:03 +03:00

multiz

Z-Lights Mk 2 (#4383)

2018-04-27 23:10:59 +03:00

nano

Preparations for BYOND version 512 (#4024)

2018-02-11 00:18:44 +02:00

orbit

…

organs

Mental Medication Additions (#4648)

2018-05-13 17:39:56 +03:00

overmap

Up-hint and UI cleanup (#3773)

2018-01-27 12:11:22 -06:00

paperwork

Ports some sounds from baystation (#4675)

2018-05-02 00:20:56 +03:00

power

Fixes vaurca lack of natural insulation (#4654)

2018-04-23 22:49:58 +02:00

projectiles

Adds weaponry permission access and a bit more (#4665)

2018-05-09 10:22:51 +02:00

random_map

Z-Lights Mk 2 (#4383)

2018-04-27 23:10:59 +03:00

reagents

Fix for Bahama Lizard cocktail. (#4718)

2018-05-15 10:15:56 +03:00

recycling

Dumb Map Fix (#4558)

2018-04-08 16:30:14 +03:00

research

Mental Medication Additions (#4648)

2018-05-13 17:39:56 +03:00

scripting

…

security levels

…

shieldgen

Bugfix/runtime cleanup (#4249)

2018-02-08 11:59:11 +02:00

shuttles

Removes the shuttle sound (#4587)

2018-04-12 20:28:21 +03:00

spells

Removes water_act from the poppet (#4681)

2018-05-01 16:59:39 +03:00

supermatter

[Ready for Review] Unapologetic Psych Buffs - Now with 80% less Mike Pence! (#4377)

2018-04-08 16:29:33 +03:00

surgery

[Ready for Review] Unapologetic Psych Buffs - Now with 80% less Mike Pence! (#4377)

2018-04-08 16:29:33 +03:00

tables

…

telesci

…

turbolift

Code and Map Bugfixes (#4514)

2018-04-19 00:03:46 +02:00

udp

…

vehicles

Fixes #4438 (#4442)

2018-03-21 07:00:57 +02:00

ventcrawl

…

virus2

list2text() -> jointext() (#4342)

2018-03-03 00:36:44 +02:00

web_interface

…

xgm

…