From 47157a20be52976c326b6d73e1454ebe8199c96b Mon Sep 17 00:00:00 2001 From: Loganbacca Date: Mon, 26 Jan 2015 17:57:34 +1300 Subject: [PATCH 1/2] Fixed mercenary game mode announcement --- code/game/gamemodes/nuclear/nuclear.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 8fd46fc8970..c2c6bb9475c 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -11,7 +11,7 @@ var/global/list/turf/synd_spawn = list() /datum/game_mode/nuclear name = "mercenary" - config_tag = "nuclear" + config_tag = "mercenary" required_players = 15 required_players_secret = 25 // 25 players - 5 players to be the nuke ops = 20 players remaining required_enemies = 1 From 37ceccf5a4603a4c1171cc7cd6d4acd53eaaf28d Mon Sep 17 00:00:00 2001 From: Loganbacca Date: Mon, 26 Jan 2015 18:24:12 +1300 Subject: [PATCH 2/2] Fixed removed items being put inside borgs --- code/modules/mob/living/silicon/robot/inventory.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index 1b132cf27de..794b983f665 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -234,3 +234,7 @@ sight_mode |= module_state_3:sight_mode else src << "You need to disable a module first!" + +/mob/living/silicon/robot/put_in_hands(var/obj/item/W) // No hands. + W.loc = get_turf(src) + return 1