Fox McCloud 7f2f766f70 Merge remote-tracking branch 'upstream/master' into attack-hulk ...

# Conflicts:
#	code/game/objects/structures/window.dm

2018-06-03 18:49:44 -04:00

..

admin

added defines for window construction states and full window diagonal dir

2018-06-03 13:11:37 +04:00

alarm

…

arcade

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

2018-04-30 09:27:11 -07:00

assembly

Their

2018-05-25 18:34:24 -07:00

atmos_automation

…

awaymissions

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

2018-04-30 09:27:11 -07:00

busy_space

…

client

Add kitty ears to load out

2018-04-28 12:07:35 +08:00

clothing

Fix a few style issues

2018-05-25 18:39:38 -07:00

countdown

…

crafting

Ports Guillotine

2018-04-27 18:58:23 -04:00

customitems

Them

2018-05-25 18:34:28 -07:00

detective_work

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

economy

Merge pull request #8947 from tigercat2000/more_ss_ports

2018-05-07 17:54:49 -04:00

error_handler

SS Conversion: Atoms, Machines, n' Mobs

2018-04-28 17:55:15 -07:00

events

Merge pull request #9008 from Fox-McCloud/remove-mode

2018-05-14 17:49:58 -07:00

examine

…

ext_scripts

…

fancytitle

…

fish

Merge remote-tracking branch 'upstream/master' into attack-hulk

2018-06-03 18:49:44 -04:00

flufftext

Their

2018-05-25 18:34:24 -07:00

food_and_drinks

Replace \his, \he, \him, \himself

2018-05-25 18:39:37 -07:00

holiday

…

hydroponics

Replace \his, \he, \him, \himself

2018-05-25 18:39:37 -07:00

karma

…

library

Fix his, he, him

2018-05-25 18:34:28 -07:00

lighting

SS Conversion: Atoms, Machines, n' Mobs

2018-04-28 17:55:15 -07:00

logic

SS Conversion: Atoms, Machines, n' Mobs

2018-04-28 17:55:15 -07:00

map_fluff

…

martial_arts

Them

2018-05-25 18:34:28 -07:00

mining

added defines for window construction states and full window diagonal dir

2018-06-03 13:11:37 +04:00

mob

Merge remote-tracking branch 'upstream/master' into attack-hulk

2018-06-03 18:49:44 -04:00

modular_computers

Removes the last of the color macros

2018-05-23 14:05:17 -04:00

nano

…

ninja

Replace \his, \he, \him, \himself

2018-05-25 18:39:37 -07:00

paperwork

Replace \his, \he, \him, \himself

2018-05-25 18:39:37 -07:00

pda

SS Conversion: Atoms, Machines, n' Mobs

2018-04-28 17:55:15 -07:00

persistence

…

power

Fix powercell

2018-05-25 18:39:38 -07:00

procedural_mapping

…

projectiles

Replace \his, \he, \him, \himself

2018-05-25 18:39:37 -07:00

reagents

Merge remote-tracking branch 'upstream/master' into attack-hulk

2018-06-03 18:49:44 -04:00

recycling

Merge pull request #8984 from Citinited/disposals-nullspace-fix

2018-05-25 18:00:00 -07:00

research

added defines for window construction states and full window diagonal dir

2018-06-03 13:11:37 +04:00

ruins

…

scripting

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

security_levels

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

shuttle

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

2018-04-30 09:27:11 -07:00

space_management

SS Conversion: Atoms, Machines, n' Mobs

2018-04-28 17:55:15 -07:00

spacepods

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

station_goals

SS Conversion: Atoms, Machines, n' Mobs

2018-04-28 17:55:15 -07:00

store

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

surgery

Replace \his, \he, \him, \himself

2018-05-25 18:39:37 -07:00

telesci

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

2018-04-30 09:27:11 -07:00

tooltip

…

tram

…

vehicle

…

vr

…