tigercat2000 b14faa19c3 Merge remote-tracking branch 'upstream/master' into SMC ...

# Conflicts:
#	code/__DEFINES/flags.dm

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

..

admin

re-adds take shortcut into adminhelp

2018-03-19 11:27:21 +00:00

alarm

…

arcade

…

assembly

…

atmos_automation

…

awaymissions

PS -> SMC Ports: LINDA, Spacedrift, Throwing

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

busy_space

…

client

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

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

clothing

Fix various syntactic problems

2018-03-06 23:19:39 -08:00

countdown

…

crafting

…

customitems

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

2018-03-13 05:20:20 +00:00

detective_work

…

economy

Update Accounts.dm

2018-01-09 21:31:11 +01:00

error_handler

…

events

spacing, src/loc consistency in playsound, reverted the weapon hitsound change, removed silicon/damage_procs.dm as it's unrelated and wasn't even included in the .dme, fixed some typos

2018-03-05 02:07:31 +05:00

examine

…

ext_scripts

…

fancytitle

…

fish

rename __DEFINES/mob.dm to __DEFINES/mobs.dm

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

flufftext

Merge pull request #8124 from Aurorablade/Dreams

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

food_and_drinks

Icon is named pill, not pills

2018-03-20 18:19:45 +01: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

…

lighting

Remove unneeded proc

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

logic

…

map_fluff

…

martial_arts

…

mining

rename __DEFINES/mob.dm to __DEFINES/mobs.dm

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

mob

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

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

modular_computers

rename __DEFINES/mob.dm to __DEFINES/mobs.dm

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

nano

…

ninja

…

paperwork

Fix various syntactic problems

2018-03-06 23:19:39 -08:00

pda

…

persistence

…

power

Merge pull request #8674 from uraniummeltdown/attacks

2018-03-22 11:55:53 -07:00

procedural_mapping

PS -> SMC Ports: LINDA, Spacedrift, Throwing

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

projectiles

More icons for the M90 (#8738)

2018-03-19 13:20:31 -07:00

reagents

Merge pull request #8708 from Birdtalon/nanocalcium

2018-03-19 13:37:20 -07:00

recycling

moves var/list/armor to /obj level

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

research

Merge pull request #8651 from uraniummeltdown/titaniummineral

2018-02-21 03:20:20 -05:00

ruins

…

scripting

…

security_levels

…

shuttle

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

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

space_management

…

spacepods

Merge pull request #8671 from Aurorablade/PodFluff

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

station_goals

…

store

…

surgery

Merge pull request #8489 from KasparoVy/eyeglow

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

telesci

…

tooltip

…

tram

…

vehicle

moves var/list/armor to /obj level

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

vr

…