Cyberboss 7863c536ce Adds cancellation for ERT creation (#25907) ...

* Fixes #15145

* Update one_click_antag.dm

2017-04-06 09:03:42 -06:00

..

admin

Adds cancellation for ERT creation (#25907)

2017-04-06 09:03:42 -06:00

assembly

Merge upstream

2017-04-02 22:27:22 -04:00

atmospherics

Merge pull request #25771 from duncathan/reactiondatums

2017-04-05 00:52:36 -05:00

awaymissions

Makes CTF flags and spawn protection not affect or get affected by non CTF mobs. (#25809)

2017-04-04 23:41:39 -06:00

cargo

Merge upstream

2017-04-01 23:38:37 -04:00

chatter

…

client

Merge upstream

2017-04-01 23:38:37 -04:00

clothing

Examining clothing with pockets will give information about the pockets (#25879)

2017-04-05 13:00:51 -06:00

crafting

Modular Receiver in Autolathe (#25401)

2017-03-25 09:21:50 +13:00

detectivework

…

emoji

…

error_handler

…

events

Merge upstream

2017-04-02 22:27:22 -04:00

flufftext

Language datums; removes the talk wheel (#25333)

2017-04-02 21:03:40 +02:00

food_and_drinks

Merge upstream

2017-04-01 23:38:37 -04:00

games

…

holiday

Merge upstream

2017-03-27 09:32:08 -04:00

holodeck

Fixes grammar on objects landing and bouncing off rims (#25722)

2017-04-01 11:15:13 -04:00

html_interface

…

hydroponics

Minor runtimes fixes. (#25566)

2017-03-29 19:21:51 -03:00

jobs

Rename ticker to SSticker

2017-03-22 10:48:25 -04:00

language

Language datums; removes the talk wheel (#25333)

2017-04-02 21:03:40 +02:00

library

Fixes some runtimes with soapstone messages

2017-03-22 20:06:09 +00:00

lighting

implements LIGHTING_ROUND_VALUE, which was defined as 1 / 128 but never used anywhere.

2017-04-04 01:35:39 -04:00

mapping

Removes the unused parts of dmm_suite (#25875)

2017-04-05 10:38:40 -03:00

mining

Merge upstream

2017-04-02 22:27:22 -04:00

mob

Sound tweaks (#25876)

2017-04-05 12:57:23 -06:00

modular_computers

Fixes Computer Programs not Returning a qdel hint

2017-04-02 19:47:56 -04:00

ninja

Merge upstream

2017-04-01 23:38:37 -04:00

orbit

…

paperwork

Merge upstream

2017-04-02 22:27:22 -04:00

power

Using TK on Supermatter now burns your head off. (#25873)

2017-04-05 09:07:37 -03:00

procedural_mapping

…

projectiles

Update projectile.dm

2017-04-03 03:31:37 -07:00

reagents

Merge pull request #25818 from AnturK/monkey_slots

2017-04-03 22:41:17 -06:00

recycling

Fixes grammar on objects landing and bouncing off rims (#25722)

2017-04-01 11:15:13 -04:00

research

Language datums; removes the talk wheel (#25333)

2017-04-02 21:03:40 +02:00

ruins

Cloth Golem Fix (#25617)

2017-03-30 16:11:36 -04:00

security_levels

…

shuttle

Merge pull request #25821 from coiax/wait-for-us

2017-04-03 22:42:03 -06:00

space_transition

…

spells

Merge upstream

2017-04-02 22:27:22 -04:00

station_goals

SSevent -> SSevents

2017-03-22 11:26:01 -04:00

stock_market

…

surgery

Merge upstream

2017-04-02 22:27:22 -04:00

telesci

…

tgui

Language datums; removes the talk wheel (#25333)

2017-04-02 21:03:40 +02:00

tooltip

…

uplink

Merge upstream

2017-03-30 19:18:59 -04:00

vehicles

Merge branch 'master' into TiredOfTheInconsistency

2017-03-23 09:21:20 -04:00

VR

…

zombie

Gives an icon to the zombie festering ooze (#25493)

2017-03-26 14:07:16 -03:00