Repede 2b21dbfd99 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self ...

# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm

2018-06-23 17:53:13 -04:00

..

calamity

…

changeling

POLARIS: "0x32" is not a valid single-bit flag

2018-03-21 14:36:53 -04:00

cult

Merge pull request #5336 from Anewbe/cult_robe_sprite_fix

2018-06-09 15:40:38 -04:00

endgame

Fix cascade portal teleporting

2018-04-19 20:17:29 -04:00

epidemic

…

events

Fix merge conflict, update virgo planet things

2018-06-16 10:43:45 -04:00

extended

…

heist

Ups the required readies to 12

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

infiltrator

…

malfunction

for(var/bad_code in world)

2018-04-29 17:55:04 -04:00

meme

…

meteor

fixes the meteor refusing to move at all after being deflected

2018-04-09 04:08:13 -04:00

mixed

grammar never ends (#4421)

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

ninja

…

nuclear

for(var/bad_code in world)

2018-04-29 17:55:04 -04:00

revolution

…

sandbox

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-01-24 19:52:12 -05:00

technomancer

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14

2018-04-15 14:19:36 -04:00

traitor

…

wizard

…

events.dm

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -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 branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

setupgame.dm

…