diff --git a/code/game/antagonist/outsider/raider.dm b/code/game/antagonist/outsider/raider.dm index 42b481970a0..1e4a481e4dc 100644 --- a/code/game/antagonist/outsider/raider.dm +++ b/code/game/antagonist/outsider/raider.dm @@ -220,7 +220,10 @@ var/datum/antagonist/raider/raiders player.equip_to_slot_or_del(new new_suit(player),slot_wear_suit) equip_weapons(player) - player.equip_to_storage(new /obj/item/device/contract_uplink) + //Try to equip it, del if we fail. + var/obj/item/device/contract_uplink/new_uplink = new() + if (!player.equip_to_appropriate_slot(new_uplink)) + qdel(new_uplink) var/obj/item/weapon/card/id/id = create_id("Visitor", player, equip = 0) id.name = "[player.real_name]'s Passport" diff --git a/config/example/config.txt b/config/example/config.txt index 7f94edde443..8653c533180 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -31,7 +31,7 @@ JOBS_HAVE_MINIMAL_ACCESS ## log OOC channel LOG_OOC -## log client Say +## log client Say LOG_SAY ## log admin actions @@ -93,7 +93,7 @@ MOD_JOB_TEMPBAN_MAX 1440 ## probablities for game modes chosen in "secret" and "random" modes -## +## ## default probablity is 1, increase to make that mode more likely to be picked ## set to 0 to disable that mode PROBABILITY EXTENDED 1 @@ -213,7 +213,7 @@ GUEST_BAN ##Remove the # mark infront of this to forbid admins from posssessing the singularity. #FORBID_SINGULO_POSSESSION -## Remove the # to show a popup 'reply to' window to every non-admin that recieves an adminPM. +## Remove the # to show a popup 'reply to' window to every non-admin that recieves an adminPM. ## The intention is to make adminPMs more visible. (although I fnd popups annoying so this defaults to off) #POPUP_ADMIN_PM @@ -255,21 +255,6 @@ USEALIENWHITELIST ## Password used for authorizing ircbot and other external tools. #COMMS_PASSWORD -## Uncomment to enable sending data to the IRC bot. -#USE_IRC_BOT - -## Uncomment if the IRC bot requires using world.Export() instead of nudge.py/libnudge -#IRC_BOT_EXPORT - -## Host where the IRC bot is hosted. Port 45678 needs to be open. -#IRC_BOT_HOST localhost - -## IRC channel to send information to. Leave blank to disable. -#MAIN_IRC #main - -## IRC channel to send adminhelps to. Leave blank to disable adminhelps-to-irc. -#ADMIN_IRC #admin - ## Path to the python2 executable on the system. Leave blank for default. ## Default is "python" on Windows, "/usr/bin/env python2" on UNIX. #PYTHON_PATH @@ -290,7 +275,7 @@ CHARACTER_SLOTS 10 ## Uncomment to use overmap system for zlevel travel #USE_OVERMAP -## Defines which Z-levels the station exists on. +## Defines which Z-levels the station exists on. STATION_LEVELS 1 ## Defines which Z-levels are used for admin functionality, such as Central Command and the Syndicate Shuttle @@ -369,4 +354,19 @@ STARLIGHT 0 #AGGRESSIVE_CHANGELOG ## Uncomment to override default brain health. -#DEFAULT_BRAIN_HEALTH 400 \ No newline at end of file +#DEFAULT_BRAIN_HEALTH 400 + +## Uncomment this to house whitelists on the SQL database. +# SQL_WHITELISTS + +## Uncomment this to use the discord bot. +# USE_DISCORD_BOT + +## The host address of the discord bot. +# DISCORD_BOT_HOST + +## The port number which the discord bot is listening for nudges. +# DISCORD_BOT_PORT + +## Uncomment this and fill in the web interface's URL to use the web interface. +# WEBINT_URL http://www.address.com/