Leshana 30454ccdc3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23 ...

# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme

2018-02-23 21:55:42 -05:00

..

calamity

…

changeling

Fixes some goofs

2018-02-17 01:19:57 -06:00

cult

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07

2018-02-07 19:30:50 -05:00

endgame

Replaces most of the gender macros. (#4681)

2018-02-03 14:40:09 -06:00

epidemic

…

events

Polaris sync

2017-12-21 04:01:07 -05:00

extended

…

heist

Ups the required readies to 12

2017-11-11 16:53:32 -06:00

infiltrator

…

malfunction

…

meme

…

meteor

Meteors No Longer Hurt Floors

2018-01-17 20:57:17 -05:00

mixed

grammar never ends (#4421)

2017-12-08 15:30:34 -06:00

ninja

…

nuclear

Ups the required readies to 12

2017-11-11 16:53:32 -06:00

revolution

…

sandbox

Planes Framework (#4545)

2018-01-17 13:45:54 -06:00

technomancer

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23

2018-02-23 21:55:42 -05:00

traitor

…

wizard

…

events.dm

Makes ion storms not emag bots

2017-10-04 13:45:41 -04:00

game_mode_latespawn.dm

…

game_mode.dm

Replaces NT Relation with Economic Status

2018-01-07 14:12:10 -08:00

gameticker.dm

Implement SSshuttles subsystem

2018-02-05 15:50:14 -05:00

newobjective.dm

Replaces most of the gender macros. (#4681)

2018-02-03 14:40:09 -06:00

objective.dm

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07

2018-02-07 19:30:50 -05:00

setupgame.dm

…