Artur c41d2e78be Conflicts!!!

2020-06-22 17:39:24 +03:00

..

jukebox_music

…

plushies

Cooonflicts

2020-06-16 01:23:42 +03:00

title_music

…

title_screens

…

admin_nicknames.txt

…

admin_ranks.txt

…

admins.txt

Tidying code.

2019-05-29 02:33:15 +01:00

antag_rep.txt

…

awaymissionconfig.txt

Ports the reworked snowcabin and beach away missions by Jerry Derpinson (the baldy)

2020-06-17 19:33:14 -05:00

comms.txt

…

config.txt

adds rudimentary linux iptables support for fail2topic

2020-04-12 16:21:51 -04:00

custom_roundstart_items.txt

…

dbconfig.txt

…

donator_groupings.txt

s

2019-08-07 13:07:38 -07:00

dynamic_config.txt

More dynamic fixes, AKA if Ghommie keeps merging without telling me I will maybe get irate (#11688)

2020-03-31 13:10:59 +02:00

external_rsc_urls.txt

…

game_options.txt

Guh

2020-06-11 18:51:01 +03:00

iceruinblacklist.txt

Ports TG Icemoon framework and map (#49680) (#12002)

2020-05-07 14:46:16 +02:00

job_threats.txt

More dynamic rework: help I wasn't done (#11642)

2020-03-28 14:46:37 +01:00

jobs.txt

changes - sprites

2020-02-20 22:17:47 -06:00

lavaRuinBlacklist.txt

Porting updates related to material datums. (#12317)

2020-05-25 14:21:00 -07:00

loadout_config.txt

…

maps.txt

don't go gently into the night, sweet prince.

2020-06-13 22:25:18 -05:00

mentors.txt

come on

2020-04-14 18:28:11 -05:00

motd.txt

…

policies.txt

…

server_to_tool_bridge_port.txt

…

silicon_laws.txt

…

spaceRuinBlacklist.txt

Screw commit history.

2020-02-02 01:26:04 +01:00

stationRuinBlacklist.txt

Added two more ruins, Owai's suggestions.

2020-02-18 12:57:48 +13:00

unbuyableshuttles.txt

…

vr_config.txt

Guh

2020-06-11 18:51:01 +03:00

whitelist.txt

…