LetterJay 6dd7c44bbc Merge pull request #2361 from Citadel-Station-13/upstream-merge-29829 ...

[MIRROR] Merges the two turf/Entereds

2017-08-18 13:41:23 -05:00

..

admin

Merge branch 'master' into upstream-merge-29690

2017-08-15 19:18:22 -05:00

assembly

Merge branch 'master' into upstream-merge-29690

2017-08-15 19:18:22 -05:00

atmospherics

Tweaks atmos canister lights.

2017-08-14 01:25:02 -05:00

awaymissions

Standardized CENTCOM spelling

2017-08-08 09:05:44 -05:00

cargo

Update console.dm

2017-08-14 18:55:25 -05:00

chatter

…

client

Merge branch 'master' into upstream-merge-29794

2017-08-18 11:14:45 -05:00

clothing

Merge branch 'master' into upstream-merge-29690

2017-08-15 19:18:22 -05:00

crafting

[MIRROR] Ports Rapid Cable Layers from /vg/ and paradise (#2162)

2017-08-02 04:56:44 -05:00

detectivework

Adds helpers to avoid << use

2017-08-08 22:28:16 -05:00

emoji

[ready]Makes bIcon better

2017-08-13 17:41:12 -05:00

error_handler

Adds helpers to avoid << use

2017-08-08 22:28:16 -05:00

events

Merge branch 'master' into upstream-merge-29611

2017-08-15 18:55:12 -05:00

fields

…

flufftext

Update Hallucination.dm

2017-08-14 08:55:45 -05:00

food_and_drinks

[ready]Makes bIcon better

2017-08-13 17:41:12 -05:00

games

…

goonchat

Update browserOutput.dm

2017-08-15 19:48:26 -05:00

holiday

Removes all checks for subsystem existence (#2252)

2017-08-04 08:41:52 -07:00

holodeck

More Initialize() garbage

2017-08-06 18:02:51 -05:00

html_interface

…

hydroponics

Annihilates the colons!

2017-08-15 10:49:55 -05:00

jobs

Standardized CENTCOM spelling

2017-08-08 09:05:44 -05:00

language

[ready]Makes bIcon better

2017-08-13 17:41:12 -05:00

library

Oocky in icky descriptions

2017-08-08 09:05:58 -05:00

lighting

Merges the two turf/Entereds

2017-08-13 18:01:40 -05:00

mapping

[MIRROR] Admin "Reload Station" Map Generator - Reloads specified block to roundstart. also buildmode area mapgens have names instead of paths on a list. (#2172)

2017-08-02 06:28:08 -05:00

mentor

…

mining

Merge pull request #2313 from Citadel-Station-13/upstream-merge-29779

2017-08-14 18:45:28 -05:00

mob

Improves attack logging of pulling / grabbing / throwing

2017-08-17 09:19:05 -05:00

modular_computers

[s] Clean up some inputs

2017-08-14 02:44:24 -05:00

ninja

Annihilates the colons!

2017-08-15 10:49:55 -05:00

orbit

…

paperwork

Annihilates the colons!

2017-08-15 10:49:55 -05:00

power

Changes smes, cells, cell charger, terminals and apcs icons

2017-08-16 20:02:24 -05:00

procedural_mapping

Fixes admin mass deleting... not actually mass deleting...

2017-08-13 01:26:39 -05:00

projectiles

Nerfs L6 SAW Hollow Point Bullets from -10 armour penetration to -60 armour penetration.

2017-08-16 17:53:39 -05:00

reagents

Removes meth explosion syringes

2017-08-16 17:59:48 -05:00

recycling

[ready]Makes bIcon better

2017-08-13 17:41:12 -05:00

research

Standardized CENTCOM spelling

2017-08-08 09:05:44 -05:00

ruins

More baseturf helpers

2017-08-13 01:28:20 -05:00

security_levels

…

server_tools

Makes IRC status return round id

2017-08-15 10:01:57 -05:00

shuttle

Standardized CENTCOM spelling

2017-08-08 09:05:44 -05:00

space_transition

…

spells

Adds helpers to avoid << use

2017-08-08 22:28:16 -05:00

station_goals

Completes major inhand split project (#2178)

2017-08-02 06:30:33 -05:00

stock_market

Spellchecking

2017-08-01 08:46:20 -05:00

surgery

Merge branch 'master' into upstream-merge-29288

2017-08-14 18:35:28 -05:00

telesci

…

tgui

Unifies datum var definitions (#2237)

2017-08-03 06:02:58 -07:00

tooltip

…

uplink

[ready]Makes bIcon better

2017-08-13 17:41:12 -05:00

vehicles

Adds helpers to avoid << use

2017-08-08 22:28:16 -05:00

vore

Fixes displaying digestion alert for preys

2017-08-08 10:22:04 +02:00

VR

Map Spellcheck

2017-07-24 21:16:46 -05:00

zombie

Spellchecking

2017-08-01 08:46:20 -05:00