tigercat2000 8e5a42a7a1 Merge remote-tracking branch 'upstream/master' into night_shift ...

# Conflicts:
#	code/world.dm

2018-04-02 17:24:36 -07:00

..

admin

Merge remote-tracking branch 'upstream/master' into night_shift

2018-03-30 10:20:21 -07:00

alarm

…

arcade

Nightshifts & Randomized Station Time

2018-03-25 23:01:04 -07:00

assembly

Merge pull request #8503 from Kyep/frikin_laser_beams

2018-04-01 18:47:31 -07:00

atmos_automation

…

awaymissions

PS -> SMC Ports: LINDA, Spacedrift, Throwing

2018-03-02 23:58:57 -08:00

busy_space

Metastation is named, finally! NSS Cerebron. Also tweaks the delays.

2017-10-26 12:10:29 -07:00

client

Merge remote-tracking branch 'upstream/master' into SMC

2018-03-22 15:35:12 -07:00

clothing

Merge pull request #8357 from Aurorablade/VirusNostolgia

2018-04-01 19:22:31 -07:00

countdown

Refactors Syndicate Bombs

2017-06-29 18:10:58 -04:00

crafting

Ports Nano UI to Subsystems

2018-03-26 23:59:52 -04:00

customitems

Second fix part 1

2018-03-24 16:41:14 -08:00

detective_work

Nightshifts & Randomized Station Time

2018-03-25 23:01:04 -07:00

economy

Merge remote-tracking branch 'upstream/master' into night_shift

2018-03-30 10:20:21 -07:00

error_handler

…

events

Nightshifts & Randomized Station Time

2018-03-25 23:01:04 -07:00

examine

Removes Stat Throttle

2018-03-28 15:50:58 -04:00

ext_scripts

Whoops

2018-03-22 15:41:33 -07:00

fancytitle

Air Traffic Control & Map Lore

2017-06-28 16:12:15 -07:00

fish

= is not == FailFish

2018-03-25 01:38:27 -05:00

flufftext

Merge pull request #8124 from Aurorablade/Dreams

2018-03-19 13:42:00 -07:00

food_and_drinks

Ports Nano UI to Subsystems

2018-03-26 23:59:52 -04:00

garbage_collection

…

holiday

No holidays fer u

2018-02-09 08:20:21 +01:00

hydroponics

moves var/list/armor to /obj level

2018-03-04 13:52:54 +05:00

karma

…

library

Uses more QDEL_NULLs

2017-06-15 00:49:00 +01:00

lighting

Remove unneeded proc

2018-01-24 00:53:12 -06:00

logic

…

map_fluff

Metastation is named, finally! NSS Cerebron. Also tweaks the delays.

2017-10-26 12:10:29 -07:00

martial_arts

compiles, find and replace particle_effect and effect_system

2017-11-04 20:16:01 +04:00

mining

Nightshifts & Randomized Station Time

2018-03-25 23:01:04 -07:00

mob

Merge remote-tracking branch 'upstream/master' into night_shift

2018-04-02 17:24:36 -07:00

modular_computers

Merge remote-tracking branch 'upstream/master' into night_shift

2018-03-30 10:20:21 -07:00

nano

Ports Nano UI to Subsystems

2018-03-26 23:59:52 -04:00

ninja

Nightshifts & Randomized Station Time

2018-03-25 23:01:04 -07:00

paperwork

Merge remote-tracking branch 'upstream/master' into night_shift

2018-03-30 10:20:21 -07:00

pda

Merge remote-tracking branch 'upstream/master' into night_shift

2018-03-30 10:20:21 -07:00

persistence

…

power

Merge remote-tracking branch 'upstream/master' into night_shift

2018-03-30 10:20:21 -07:00

procedural_mapping

PS -> SMC Ports: LINDA, Spacedrift, Throwing

2018-03-02 23:58:57 -08:00

projectiles

Merge fix

2018-04-01 19:17:48 -08:00

reagents

Merge remote-tracking branch 'upstream/master' into night_shift

2018-03-30 10:20:21 -07:00

recycling

Ports Nano UI to Subsystems

2018-03-26 23:59:52 -04:00

research

Fixes Mech Disablers being not printable half the time

2018-03-30 19:20:51 +02:00

ruins

…

scripting

Nightshifts & Randomized Station Time

2018-03-25 23:01:04 -07:00

security_levels

Merge remote-tracking branch 'upstream/master' into night_shift

2018-04-02 17:24:36 -07:00

shuttle

Ports Nano UI to Subsystems

2018-03-26 23:59:52 -04:00

space_management

Fixes for numerous runtimes

2017-07-16 14:42:11 -07:00

spacepods

Merge pull request #8671 from Aurorablade/PodFluff

2018-03-12 15:58:39 -04:00

station_goals

Ports Nano UI to Subsystems

2018-03-26 23:59:52 -04:00

store

Nightshifts & Randomized Station Time

2018-03-25 23:01:04 -07:00

surgery

Merge pull request #8489 from KasparoVy/eyeglow

2018-03-03 17:20:52 -05:00

telesci

compiles, find and replace particle_effect and effect_system

2017-11-04 20:16:01 +04:00

tooltip

…

tram

…

vehicle

moves var/list/armor to /obj level

2018-03-04 13:52:54 +05:00

vr

…